Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a2e56cf authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6634345 from ade48be7 to mainline-release 

Change-Id: I67cfc553fbeffe8098ab3b4e2d6120f7769d8332
parents f8b42d6a ade48be7

core/soong_android_app_set.mk

+13 −0
Original line number Original line Diff line number Diff line
@@ -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)

$(LOCAL_INSTALLED_MODULE): PRIVATE_POST_INSTALL_CMD := $(LOCAL_POST_INSTALL_CMD)

PACKAGES.$(LOCAL_MODULE).OVERRIDES := $(strip $(LOCAL_OVERRIDES_PACKAGES))

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)
 
SOONG_ALREADY_CONV += $(LOCAL_MODULE)

tools/releasetools/validate_target_files.py

+11 −0
Original line number Original line Diff line number Diff line
@@ -371,6 +371,17 @@ def ValidateVerifiedBootImages(input_tmp, info_dict, options): 
            partition, info_dict, key_file)

            partition, info_dict, key_file)

        cmd.extend(['--expected_chain_partition', chained_partition_arg])

        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)

    proc = common.Run(cmd)

    stdoutdata, _ = proc.communicate()

    stdoutdata, _ = proc.communicate()

    assert proc.returncode == 0, \

    assert proc.returncode == 0, \