diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-06-27 01:06:49 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-06-27 01:15:31 +0000 |
| commit | bf8263a8e851e006efe78af33ad162849bf37428 (patch) | |
| tree | abaa199467a4b65b59a74016660ce7db0707bc27 | |
| parent | 28ea52d120cb885b74a73a2e05f8d2e66aee9712 (diff) | |
| parent | d7dabee7fef3215c8f509d2b0e928fbbbf2fd387 (diff) | |
| download | build_make-bf8263a8e851e006efe78af33ad162849bf37428.tar.gz build_make-bf8263a8e851e006efe78af33ad162849bf37428.tar.bz2 build_make-bf8263a8e851e006efe78af33ad162849bf37428.zip | |
Make change and version bump to RP1A.200627.001
Change-Id: I5b231a1b8a6bbaf40c52004701f1192601987c92
| -rw-r--r-- | core/build_id.mk | 2 | ||||
| -rw-r--r-- | core/soong_android_app_set.mk | 13 | ||||
| -rwxr-xr-x | tools/releasetools/validate_target_files.py | 11 |
3 files changed, 25 insertions, 1 deletions
diff --git a/core/build_id.mk b/core/build_id.mk index f1866ec5e7..63ea6fdf89 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -BUILD_ID=RP1A.200626.001 +BUILD_ID=RP1A.200627.001 diff --git a/core/soong_android_app_set.mk b/core/soong_android_app_set.mk index 5ed9b2c29b..eb8e5e7550 100644 --- a/core/soong_android_app_set.mk +++ b/core/soong_android_app_set.mk @@ -31,4 +31,17 @@ LOCAL_POST_INSTALL_CMD := unzip -qo -j -d $(dir $(LOCAL_INSTALLED_MODULE)) \ $(LOCAL_INSTALLED_MODULE): PRIVATE_POST_INSTALL_CMD := $(LOCAL_POST_INSTALL_CMD) PACKAGES.$(LOCAL_MODULE).OVERRIDES := $(strip $(LOCAL_OVERRIDES_PACKAGES)) +# android_app_set modules are always presigned +PACKAGES.$(LOCAL_MODULE).CERTIFICATE := PRESIGNED +PACKAGES := $(PACKAGES) $(LOCAL_MODULE) + +ifneq ($(LOCAL_MODULE_STEM),) + PACKAGES.$(LOCAL_MODULE).STEM := $(LOCAL_MODULE_STEM) +else + PACKAGES.$(LOCAL_MODULE).STEM := $(LOCAL_MODULE) +endif + +# Set a actual_partition_tag (calculated in base_rules.mk) for the package. +PACKAGES.$(LOCAL_MODULE).PARTITION := $(actual_partition_tag) + SOONG_ALREADY_CONV += $(LOCAL_MODULE) diff --git a/tools/releasetools/validate_target_files.py b/tools/releasetools/validate_target_files.py index 69be5119ab..ac469eb685 100755 --- a/tools/releasetools/validate_target_files.py +++ b/tools/releasetools/validate_target_files.py @@ -371,6 +371,17 @@ def ValidateVerifiedBootImages(input_tmp, info_dict, options): partition, info_dict, key_file) cmd.extend(['--expected_chain_partition', chained_partition_arg]) + # Handle the boot image with a non-default name, e.g. boot-5.4.img + boot_images = info_dict.get("boot_images") + if boot_images: + # we used the 1st boot image to generate the vbmeta. Rename the filename + # to boot.img so that avbtool can find it correctly. + first_image_name = boot_images.split()[0] + first_image_path = os.path.join(input_tmp, 'IMAGES', first_image_name) + assert os.path.isfile(first_image_path) + renamed_boot_image_path = os.path.join(input_tmp, 'IMAGES', 'boot.img') + os.rename(first_image_path, renamed_boot_image_path) + proc = common.Run(cmd) stdoutdata, _ = proc.communicate() assert proc.returncode == 0, \ |