Merge tag 'android-11.0.0_r48' of https://android.googlesource.com/pl… #2
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 30 commits
July 28, 2020 02:48
Change-Id: Ib358dd392f3f172a30845e437dde2a8e3b197c98
Change-Id: Iac4059653262130b47289ffe86d94896c4a775e9
Change-Id: I79533b740f2e49fed093ccc23f3fedb91bef1b4e
Change-Id: I173050d12c851b185be5573facc6a6a69e9cb491
Change-Id: I431d042163d1082863b644acd7fefbb9cc462293
Change-Id: Iec2fae53ed3cee7986141b288b79f8f8c9d93fbe
Change-Id: I13120b7b043b33cecbe27ae5ae5a14f10bc5f4c0
Change-Id: Iebd23063ef9afab4b65421c6d3030ec4daeb5237
Change-Id: Ief6fdc0af00fb23768eaa96ba5e4257555bba832
Change-Id: I68b4b1cbaf4269ff1f8f82068118b455da310a11
Change-Id: I535053f727faeae20bc6b48db910464f50187adf
Change-Id: I873066d8036f8e24ba7bd6d95cc2b11d7ea1a430
Change-Id: I1c58bb5d4fd53119d525851583ee9b3f13368145
Change-Id: Ibf9d4ff3eb7a78a0276233a66f9a82007dfa2553
Change-Id: If179dcd9ae87f3db2c40cf4fe80f85c9d7a21fb8
Change-Id: I71754bb2dd17bf5a4acf1f85d988f5d4d46e3985
Change-Id: I23994ec17409d2f53f29cbf300d9507ed00ba8e5
Change-Id: Ic79e6ac09ba4c9094a37e47a8f57cda9df05d99d
Change-Id: I922d2dad523b24abe6271d346bba87e4444a4227
Change-Id: Ib8a7aa491be587c38234c25a70ab0bef51011789
Change-Id: I39b389f2fc6d8a8811cfaebb6ed97530e5614e1d
Change-Id: I76d44eb2a63030d9e19ac35e247e4bcfb4497f3b
Change-Id: I354796c71cb7ab91809fa9cf5fc3eb78ae0e0554
Change-Id: I9dc087bc34c3ab70e617f7a4d9c66b1a702b426f
Change-Id: I13e3c6779f4931cb4b67c7ea44746cd2cc4da496
Change-Id: If93a2de84b3196063e56c74a8813f366078d98ce
Change-Id: I796a2044fc8703df24846660815a7fc8b4a7a1ea
Change-Id: I9ca9f2f5517ee15bfc7ad07d1bddefad364f0e74
Change-Id: I79b147687407ff9aa2e4cbcbbd75012d29c858cc
Change-Id: I380e30c03e5aa61479d954a53e4bbf1fa56ee947
Change-Id: If39ad2a5da2bec420ce1e6703022cb0d817ead80
Change-Id: Ie783f86535a78aeeee89cbedb5981e3e03bac1fb
Change-Id: Ib8bf01b66b4d8871e488a1a5fa06773954a6feb2
Change-Id: If6b53a91f818393edf6653324a7dda18342c2bc7
Bug: 188458861 Change-Id: Icdc728241b1bfe2428d1e6536a1a3b51f7a4a708 (cherry picked from commit 64b00db)
Bug: 191053489 Change-Id: Ieba9625ca0ccedf285209954f1e766b20455c32f (cherry picked from commit f5139e3)
Bug: 192405736 Change-Id: Icea699ec7f82744ff0a6dca90068b2737129778a (cherry picked from commit cfd4896)
Change-Id: I61a451fa21fa0e5f23d3cf9f0d8152ddd095b807
Change-Id: I24364b4ba1aefa24192f981d2f825c539943e50c
Change-Id: Ief0dfc0d320bd29064aea81d4eb71446e89f4118
Bug: 193547118 Change-Id: I36d8511d8ab1556af5c278c8d65d7c3ee6f1878d Merged-In: I4a0cd58b18214b77302ae7ed81c189f4549dc41d (cherry picked from commit 6ccb50d)
Change-Id: Ic90b8add7efda147d5fcba544f0d6fbb4026026b
Change-Id: I922a274ebe7533552b5f743cae294e5dffd7ca08
…atform/build into fire Android 11.0.0 Release 48 (RD2A.211001.002)
Viktor-Hermann
pushed a commit
to RavZen/android_build
that referenced
this pull request
Apr 22, 2022
…w header lib This is a combination of 3 commits. This is the 1st commit message: build: add kernel header dependency if module uses kernel headers Many of the QCOM components use kernel headers, but don't declare the dependency on them. This is fine in CAF because of the way they build the boot.img before anything else. In CM, we don't build the boot.img the same, so we run into a race between the kernel build & these modules... and the modules lose. Warn about modules that have this missing dependency, and add it for them so we don't have to modify each Android.mk. Change-Id: I95f1e47b5ef440f6f5d8f64a0c3f38d9572e839e ============================================================================ This is the commit message Spark-Rom#2: build: Switch kernel header inclusion The build is switching to the target INSTALLED_KERNEL_HEADERS to declare dependencies on kernel headers. Change-Id: I913e74681b02dfcf1eaed3d1e47ff4ab2300b12d ============================================================================ This is the commit message Spark-Rom#3: build: Automatically replace old-style kernel header includes with new header lib Since we do this via soong and the result is a header library, just replace all legacy include paths that point to the old header location with calls to the new header library. Since we no longer have the legacy include, we can also remove the additional dependency. This reverts commit fa798218e5b7f96e12ab3acc9d47a3f26a140777. Change-Id: I716955534e50831e6568ca01e480aa8b90075d92
Viktor-Hermann
pushed a commit
to RavZen/android_build
that referenced
this pull request
Apr 22, 2022
This is a combination of 2 commits.
This is the 1st commit message:
Add BOARD_CUSTOM_BOOTIMG_MK support
Simplified version of the previous implementation. Recovery's ramdisk
is spun off from the main recovery target again to allow overriding
just the image-generation step
[mikeioannina]: Squash cm-13.0 changes and adapt to N
Change-Id: I058d214f0cf2d05b7621b369ef1f8a983c3ac258
This is the commit message Spark-Rom#2:
build: Handle custom boot images properly
When a pre-built image should be used, it should be stored in the
target files zip so that it can be used with external signing
processes.
Original-Change-Id: I2661af9ac58af30bb9314b552775046d3abf44e0
Change-Id: I10b3bd0bb33489b8ffb26d16d002f8dd6ff405ad
[aleasto]
Rewritten for R, where the recovery ramdisk is created via
make dependencies, rather than $(call)s
[mainey]
Adapt to new flag INTERNAL_RECOVERY_RAMDISK_FILES_TIMESTAMP
Change-Id: I058d214f0cf2d05b7621b369ef1f8a983c3ac258
Viktor-Hermann
pushed a commit
to RavZen/android_build
that referenced
this pull request
May 5, 2022
…w header lib This is a combination of 3 commits. This is the 1st commit message: build: add kernel header dependency if module uses kernel headers Many of the QCOM components use kernel headers, but don't declare the dependency on them. This is fine in CAF because of the way they build the boot.img before anything else. In CM, we don't build the boot.img the same, so we run into a race between the kernel build & these modules... and the modules lose. Warn about modules that have this missing dependency, and add it for them so we don't have to modify each Android.mk. Change-Id: I95f1e47b5ef440f6f5d8f64a0c3f38d9572e839e ============================================================================ This is the commit message Spark-Rom#2: build: Switch kernel header inclusion The build is switching to the target INSTALLED_KERNEL_HEADERS to declare dependencies on kernel headers. Change-Id: I913e74681b02dfcf1eaed3d1e47ff4ab2300b12d ============================================================================ This is the commit message Spark-Rom#3: build: Automatically replace old-style kernel header includes with new header lib Since we do this via soong and the result is a header library, just replace all legacy include paths that point to the old header location with calls to the new header library. Since we no longer have the legacy include, we can also remove the additional dependency. This reverts commit fa798218e5b7f96e12ab3acc9d47a3f26a140777. Change-Id: I716955534e50831e6568ca01e480aa8b90075d92 Signed-off-by: Joey Huab <[email protected]>
Viktor-Hermann
pushed a commit
to RavZen/android_build
that referenced
this pull request
May 5, 2022
This is a combination of 2 commits.
This is the 1st commit message:
Add BOARD_CUSTOM_BOOTIMG_MK support
Simplified version of the previous implementation. Recovery's ramdisk
is spun off from the main recovery target again to allow overriding
just the image-generation step
[mikeioannina]: Squash cm-13.0 changes and adapt to N
Change-Id: I058d214f0cf2d05b7621b369ef1f8a983c3ac258
This is the commit message Spark-Rom#2:
build: Handle custom boot images properly
When a pre-built image should be used, it should be stored in the
target files zip so that it can be used with external signing
processes.
Original-Change-Id: I2661af9ac58af30bb9314b552775046d3abf44e0
Change-Id: I10b3bd0bb33489b8ffb26d16d002f8dd6ff405ad
[aleasto]
Rewritten for R, where the recovery ramdisk is created via
make dependencies, rather than $(call)s
[mainey]
Adapt to new flag INTERNAL_RECOVERY_RAMDISK_FILES_TIMESTAMP
Change-Id: I058d214f0cf2d05b7621b369ef1f8a983c3ac258
Signed-off-by: Joey Huab <[email protected]>
spkal01
pushed a commit
that referenced
this pull request
May 10, 2022
This is a combination of 2 commits.
This is the 1st commit message:
Add BOARD_CUSTOM_BOOTIMG_MK support
Simplified version of the previous implementation. Recovery's ramdisk
is spun off from the main recovery target again to allow overriding
just the image-generation step
[mikeioannina]: Squash cm-13.0 changes and adapt to N
Change-Id: I058d214f0cf2d05b7621b369ef1f8a983c3ac258
This is the commit message #2:
build: Handle custom boot images properly
When a pre-built image should be used, it should be stored in the
target files zip so that it can be used with external signing
processes.
Original-Change-Id: I2661af9ac58af30bb9314b552775046d3abf44e0
Change-Id: I10b3bd0bb33489b8ffb26d16d002f8dd6ff405ad
[aleasto]
Rewritten for R, where the recovery ramdisk is created via
make dependencies, rather than $(call)s
[mainey]
Adapt to new flag INTERNAL_RECOVERY_RAMDISK_FILES_TIMESTAMP
Change-Id: I058d214f0cf2d05b7621b369ef1f8a983c3ac258
Viktor-Hermann
pushed a commit
to RavZen/android_build
that referenced
this pull request
Jul 26, 2022
…w header lib This is a combination of 3 commits. This is the 1st commit message: build: add kernel header dependency if module uses kernel headers Many of the QCOM components use kernel headers, but don't declare the dependency on them. This is fine in CAF because of the way they build the boot.img before anything else. In CM, we don't build the boot.img the same, so we run into a race between the kernel build & these modules... and the modules lose. Warn about modules that have this missing dependency, and add it for them so we don't have to modify each Android.mk. Change-Id: I95f1e47b5ef440f6f5d8f64a0c3f38d9572e839e ============================================================================ This is the commit message Spark-Rom#2: build: Switch kernel header inclusion The build is switching to the target INSTALLED_KERNEL_HEADERS to declare dependencies on kernel headers. Change-Id: I913e74681b02dfcf1eaed3d1e47ff4ab2300b12d ============================================================================ This is the commit message Spark-Rom#3: build: Automatically replace old-style kernel header includes with new header lib Since we do this via soong and the result is a header library, just replace all legacy include paths that point to the old header location with calls to the new header library. Since we no longer have the legacy include, we can also remove the additional dependency. This reverts commit fa798218e5b7f96e12ab3acc9d47a3f26a140777. Change-Id: I716955534e50831e6568ca01e480aa8b90075d92
Viktor-Hermann
pushed a commit
to RavZen/android_build
that referenced
this pull request
Jul 26, 2022
This is a combination of 2 commits.
This is the 1st commit message:
Add BOARD_CUSTOM_BOOTIMG_MK support
Simplified version of the previous implementation. Recovery's ramdisk
is spun off from the main recovery target again to allow overriding
just the image-generation step
[mikeioannina]: Squash cm-13.0 changes and adapt to N
Change-Id: I058d214f0cf2d05b7621b369ef1f8a983c3ac258
This is the commit message Spark-Rom#2:
build: Handle custom boot images properly
When a pre-built image should be used, it should be stored in the
target files zip so that it can be used with external signing
processes.
Original-Change-Id: I2661af9ac58af30bb9314b552775046d3abf44e0
Change-Id: I10b3bd0bb33489b8ffb26d16d002f8dd6ff405ad
[aleasto]
Rewritten for R, where the recovery ramdisk is created via
make dependencies, rather than $(call)s
[mainey]
Adapt to new flag INTERNAL_RECOVERY_RAMDISK_FILES_TIMESTAMP
Change-Id: I058d214f0cf2d05b7621b369ef1f8a983c3ac258
Viktor-Hermann
pushed a commit
to RavZen/android_build
that referenced
this pull request
Aug 7, 2022
…w header lib This is a combination of 3 commits. This is the 1st commit message: build: add kernel header dependency if module uses kernel headers Many of the QCOM components use kernel headers, but don't declare the dependency on them. This is fine in CAF because of the way they build the boot.img before anything else. In CM, we don't build the boot.img the same, so we run into a race between the kernel build & these modules... and the modules lose. Warn about modules that have this missing dependency, and add it for them so we don't have to modify each Android.mk. Change-Id: I95f1e47b5ef440f6f5d8f64a0c3f38d9572e839e ============================================================================ This is the commit message Spark-Rom#2: build: Switch kernel header inclusion The build is switching to the target INSTALLED_KERNEL_HEADERS to declare dependencies on kernel headers. Change-Id: I913e74681b02dfcf1eaed3d1e47ff4ab2300b12d ============================================================================ This is the commit message Spark-Rom#3: build: Automatically replace old-style kernel header includes with new header lib Since we do this via soong and the result is a header library, just replace all legacy include paths that point to the old header location with calls to the new header library. Since we no longer have the legacy include, we can also remove the additional dependency. This reverts commit fa798218e5b7f96e12ab3acc9d47a3f26a140777. Change-Id: I716955534e50831e6568ca01e480aa8b90075d92 Reviewed-on: https://review.statixos.com/c/android_build/+/5648 Reviewed-by: Anay Wadhera <[email protected]> Tested-by: Anay Wadhera <[email protected]> Reviewed-on: https://review.statixos.com/c/android_build/+/7023
spkal01
pushed a commit
that referenced
this pull request
Aug 18, 2022
This is a combination of 2 commits.
This is the 1st commit message:
Add BOARD_CUSTOM_BOOTIMG_MK support
Simplified version of the previous implementation. Recovery's ramdisk
is spun off from the main recovery target again to allow overriding
just the image-generation step
[mikeioannina]: Squash cm-13.0 changes and adapt to N
Change-Id: I058d214f0cf2d05b7621b369ef1f8a983c3ac258
This is the commit message #2:
build: Handle custom boot images properly
When a pre-built image should be used, it should be stored in the
target files zip so that it can be used with external signing
processes.
Original-Change-Id: I2661af9ac58af30bb9314b552775046d3abf44e0
Change-Id: I10b3bd0bb33489b8ffb26d16d002f8dd6ff405ad
[aleasto]
Rewritten for R, where the recovery ramdisk is created via
make dependencies, rather than $(call)s
[mainey]
Adapt to new flag INTERNAL_RECOVERY_RAMDISK_FILES_TIMESTAMP
Change-Id: I058d214f0cf2d05b7621b369ef1f8a983c3ac258
spkal01
pushed a commit
that referenced
this pull request
Aug 18, 2022
This is a combination of 2 commits.
This is the 1st commit message:
Add BOARD_CUSTOM_BOOTIMG_MK support
Simplified version of the previous implementation. Recovery's ramdisk
is spun off from the main recovery target again to allow overriding
just the image-generation step
[mikeioannina]: Squash cm-13.0 changes and adapt to N
Change-Id: I058d214f0cf2d05b7621b369ef1f8a983c3ac258
This is the commit message #2:
build: Handle custom boot images properly
When a pre-built image should be used, it should be stored in the
target files zip so that it can be used with external signing
processes.
Original-Change-Id: I2661af9ac58af30bb9314b552775046d3abf44e0
Change-Id: I10b3bd0bb33489b8ffb26d16d002f8dd6ff405ad
[aleasto]
Rewritten for R, where the recovery ramdisk is created via
make dependencies, rather than $(call)s
[mainey]
Adapt to new flag INTERNAL_RECOVERY_RAMDISK_FILES_TIMESTAMP
Change-Id: I058d214f0cf2d05b7621b369ef1f8a983c3ac258
Signed-off-by: spkal01 <[email protected]>
spkal01
pushed a commit
that referenced
this pull request
Nov 10, 2022
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18083390 Change-Id: I53847261967eb9d7f69a269efd972b86d65ec919 Signed-off-by: Automerger Merge Worker <[email protected]>
spkal01
pushed a commit
that referenced
this pull request
Dec 6, 2022
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18083390 Change-Id: I3ce1fd2760e346c2d7d0641526daeb41a1f320fc Signed-off-by: Automerger Merge Worker <[email protected]>
Albinoman887
pushed a commit
to Albinoman887/build_make
that referenced
this pull request
May 16, 2023
…w header lib This is a combination of 3 commits. This is the 1st commit message: build: add kernel header dependency if module uses kernel headers Many of the QCOM components use kernel headers, but don't declare the dependency on them. This is fine in CAF because of the way they build the boot.img before anything else. In CM, we don't build the boot.img the same, so we run into a race between the kernel build & these modules... and the modules lose. Warn about modules that have this missing dependency, and add it for them so we don't have to modify each Android.mk. Change-Id: I95f1e47b5ef440f6f5d8f64a0c3f38d9572e839e ============================================================================ This is the commit message Spark-Rom#2: build: Switch kernel header inclusion The build is switching to the target INSTALLED_KERNEL_HEADERS to declare dependencies on kernel headers. Change-Id: I913e74681b02dfcf1eaed3d1e47ff4ab2300b12d ============================================================================ This is the commit message Spark-Rom#3: build: Automatically replace old-style kernel header includes with new header lib Since we do this via soong and the result is a header library, just replace all legacy include paths that point to the old header location with calls to the new header library. Since we no longer have the legacy include, we can also remove the additional dependency. This reverts commit fa798218e5b7f96e12ab3acc9d47a3f26a140777. Change-Id: I716955534e50831e6568ca01e480aa8b90075d92
Albinoman887
pushed a commit
to Albinoman887/build_make
that referenced
this pull request
May 16, 2023
This is a combination of 2 commits.
This is the 1st commit message:
Add BOARD_CUSTOM_BOOTIMG_MK support
Simplified version of the previous implementation. Recovery's ramdisk
is spun off from the main recovery target again to allow overriding
just the image-generation step
[mikeioannina]: Squash cm-13.0 changes and adapt to N
Change-Id: I058d214f0cf2d05b7621b369ef1f8a983c3ac258
This is the commit message Spark-Rom#2:
build: Handle custom boot images properly
When a pre-built image should be used, it should be stored in the
target files zip so that it can be used with external signing
processes.
Original-Change-Id: I2661af9ac58af30bb9314b552775046d3abf44e0
Change-Id: I10b3bd0bb33489b8ffb26d16d002f8dd6ff405ad
[aleasto]
Rewritten for R, where the recovery ramdisk is created via
make dependencies, rather than $(call)s
[mainey]
Adapt to new flag INTERNAL_RECOVERY_RAMDISK_FILES_TIMESTAMP
Change-Id: I058d214f0cf2d05b7621b369ef1f8a983c3ac258
spkal01
pushed a commit
that referenced
this pull request
May 18, 2023
…w header lib This is a combination of 3 commits. This is the 1st commit message: build: add kernel header dependency if module uses kernel headers Many of the QCOM components use kernel headers, but don't declare the dependency on them. This is fine in CAF because of the way they build the boot.img before anything else. In CM, we don't build the boot.img the same, so we run into a race between the kernel build & these modules... and the modules lose. Warn about modules that have this missing dependency, and add it for them so we don't have to modify each Android.mk. Change-Id: I95f1e47b5ef440f6f5d8f64a0c3f38d9572e839e ============================================================================ This is the commit message #2: build: Switch kernel header inclusion The build is switching to the target INSTALLED_KERNEL_HEADERS to declare dependencies on kernel headers. Change-Id: I913e74681b02dfcf1eaed3d1e47ff4ab2300b12d ============================================================================ This is the commit message #3: build: Automatically replace old-style kernel header includes with new header lib Since we do this via soong and the result is a header library, just replace all legacy include paths that point to the old header location with calls to the new header library. Since we no longer have the legacy include, we can also remove the additional dependency. This reverts commit fa798218e5b7f96e12ab3acc9d47a3f26a140777. Change-Id: I716955534e50831e6568ca01e480aa8b90075d92 Signed-off-by: spkal01 <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
…atform/build into fire
Android 11.0.0 Release 48 (RD2A.211001.002)