releasetools: do not remove dynamic partitions in system-only builds #2

PCMasterRace007 · 2020-06-13T15:32:32Z

Before this commit, the generated dynamic_partitions_op_list in
FullOTA packages always tries to remove all partitions and recreate
them upon flashing. This makes it impossible to have a system-only
"FullOTA" because vendor partition(s) are always removed.
This commit detects if a build is vendor-less and disables every
dynamic partition operation except resize, in order to keep the
original content around after the flash. The change should not affect
non-dynamic-partition or builds with vendor image included.

* Before this commit, the generated `dynamic_partitions_op_list` in FullOTA packages always tries to remove all partitions and recreate them upon flashing. This makes it impossible to have a system-only "FullOTA" because vendor partition(s) are always removed. * This commit detects if a build is vendor-less and disables every dynamic partition operation except `resize`, in order to keep the original content around after the flash. The change should not affect non-dynamic-partition or builds with vendor image included.

…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 fa79821. Change-Id: I716955534e50831e6568ca01e480aa8b90075d92 Signed-off-by: RakeshBatra <raakesh.batra@rediffmail.com>

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: RakeshBatra <raakesh.batra@rediffmail.com>

…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 fa79821. Change-Id: I716955534e50831e6568ca01e480aa8b90075d92 Signed-off-by: RakeshBatra <raakesh.batra@rediffmail.com>

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: RakeshBatra <raakesh.batra@rediffmail.com>

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18083390 Change-Id: I53847261967eb9d7f69a269efd972b86d65ec919 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18083390 Change-Id: I3ce1fd2760e346c2d7d0641526daeb41a1f320fc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

…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 fa79821. Change-Id: I716955534e50831e6568ca01e480aa8b90075d92 Signed-off-by: RakeshBatra <raakesh.batra@rediffmail.com>

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: RakeshBatra <raakesh.batra@rediffmail.com>

…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 fa79821. Change-Id: I716955534e50831e6568ca01e480aa8b90075d92 Signed-off-by: RakeshBatra <raakesh.batra@rediffmail.com>

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: RakeshBatra <raakesh.batra@rediffmail.com>

mg712702 force-pushed the c10 branch from d3c2341 to 5dd4280 Compare September 16, 2020 01:47

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

releasetools: do not remove dynamic partitions in system-only builds #2

releasetools: do not remove dynamic partitions in system-only builds #2

Uh oh!

PCMasterRace007 commented Jun 13, 2020

Uh oh!

Uh oh!

releasetools: do not remove dynamic partitions in system-only builds #2

Are you sure you want to change the base?

releasetools: do not remove dynamic partitions in system-only builds #2

Uh oh!

Conversation

PCMasterRace007 commented Jun 13, 2020

Uh oh!

Uh oh!