diff options
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2021-03-05 17:29:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-03-05 17:29:47 +0000 |
| commit | 105cf65e2c9db2145baaabd573dd6d05f90694da (patch) | |
| tree | 03f6f3ff6a0ca9a2b939049bd2e2915705db98a6 | |
| parent | dc264457465a583a080ccc343f25351be87cd95a (diff) | |
| parent | 4d971f412b4fe22cb658942e34c528136a5ea5b5 (diff) | |
| download | build-platform-tools-31.0.1.tar.gz | |
Merge "Snap for 7187421 from 5d8217afb773abf84191787764dbdb23b2e17ea1 to sdk-release" into sdk-releaseplatform-tools-31.0.1
| -rw-r--r-- | core/Makefile | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/core/Makefile b/core/Makefile index ed9465da86..c8b8ae9473 100644 --- a/core/Makefile +++ b/core/Makefile @@ -800,7 +800,7 @@ ifdef BOARD_BOOTIMAGE_PARTITION_SIZE endif # $1: boot image file name -# $2: boot image variant (boot, boot-debug) +# $2: boot image variant (boot, boot-debug, boot-test-harness) define get-bootimage-partition-size $(BOARD_$(call to-upper,$(subst .img,,$(subst $(2),kernel,$(notdir $(1)))))_BOOTIMAGE_PARTITION_SIZE) endef @@ -2327,21 +2327,22 @@ endif BOARD_AVB_BOOT_TEST_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem INTERNAL_AVB_BOOT_TEST_SIGNING_ARGS := --algorithm SHA256_RSA2048 --key $(BOARD_AVB_BOOT_TEST_KEY_PATH) # $(1): the bootimage to sign +# $(2): boot image variant (boot, boot-debug, boot-test-harness) define test-key-sign-bootimage -$(call assert-max-image-size,$(1),$(call get-hash-image-max-size,$(call get-bootimage-partition-size,$(1),boot-debug))) +$(call assert-max-image-size,$(1),$(call get-hash-image-max-size,$(call get-bootimage-partition-size,$(1),$(2)))) $(AVBTOOL) add_hash_footer \ --image $(1) \ - --partition_size $(call get-bootimage-partition-size,$(1),boot-debug)\ + --partition_size $(call get-bootimage-partition-size,$(1),$(2))\ --partition_name boot $(INTERNAL_AVB_BOOT_TEST_SIGNING_ARGS) \ $(BOARD_AVB_BOOT_ADD_HASH_FOOTER_ARGS) -$(call assert-max-image-size,$(1),$(call get-bootimage-partition-size,$(1),boot-debug)) +$(call assert-max-image-size,$(1),$(call get-bootimage-partition-size,$(1),$(2))) endef # $(1): output file define build-debug-bootimage-target $(MKBOOTIMG) --kernel $(PRODUCT_OUT)/$(subst .img,,$(subst boot-debug,kernel,$(notdir $(1)))) \ $(INTERNAL_DEBUG_BOOTIMAGE_ARGS) $(INTERNAL_MKBOOTIMG_VERSION_ARGS) $(BOARD_MKBOOTIMG_ARGS) --output $1 - $(if $(BOARD_AVB_BOOT_KEY_PATH),$(call test-key-sign-bootimage,$1)) + $(if $(BOARD_AVB_BOOT_KEY_PATH),$(call test-key-sign-bootimage,$1,boot-debug)) endef # Depends on original boot.img and ramdisk-debug.img, to build the new boot-debug.img @@ -2510,7 +2511,7 @@ endif define build-boot-test-harness-target $(MKBOOTIMG) --kernel $(PRODUCT_OUT)/$(subst .img,,$(subst boot-test-harness,kernel,$(notdir $(1)))) \ $(INTERNAL_TEST_HARNESS_BOOTIMAGE_ARGS) $(INTERNAL_MKBOOTIMG_VERSION_ARGS) $(BOARD_MKBOOTIMG_ARGS) --output $@ - $(if $(BOARD_AVB_BOOT_KEY_PATH),$(call test-key-sign-bootimage,$@)) + $(if $(BOARD_AVB_BOOT_KEY_PATH),$(call test-key-sign-bootimage,$@,boot-test-harness)) endef # Build the new boot-test-harness.img, based on boot-debug.img and ramdisk-test-harness.img. |