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

Commit 5c152b0a authored by Spandan Das's avatar Spandan Das
Browse files

Use soong defined systemimage's avb_key for system_other 

Bug: 376539388
Test: lunch aosp_cf_x86_64_phone-trunk_staging-userdebug
Test: Built make's and soong's target_files.zip and verified that
system_other.img is bit-identical

Change-Id: I3108e789849ba53f0b6e091fd387977722f4e01a
parent 80793035

core/Makefile

+8 −3
Original line number Diff line number Diff line
@@ -2328,9 +2328,10 @@ $(if $(BOARD_AVB_ENABLE), \ 
  $(if $(filter $(2),system_other), \

    $(hide) echo "avb_system_other_hashtree_enable=$(BOARD_AVB_ENABLE)" >> $(1)$(newline) \

    $(hide) echo "avb_system_other_add_hashtree_footer_args=$(BOARD_AVB_SYSTEM_OTHER_ADD_HASHTREE_FOOTER_ARGS)" >> $(1)$(newline) \

    $(if $(BOARD_AVB_SYSTEM_KEY_PATH),\

      $(hide) echo "avb_system_other_key_path=$(BOARD_AVB_SYSTEM_KEY_PATH)" >> $(1)$(newline) \

      $(hide) echo "avb_system_other_algorithm=$(BOARD_AVB_SYSTEM_ALGORITHM)" >> $(1)$(newline))) \

    $(if $(PRODUCT_SOONG_DEFINED_SYSTEM_IMAGE_AVB_KEY_PATH)$(BOARD_AVB_SYSTEM_KEY_PATH),\

      $(hide) echo "avb_system_other_key_path=$(firstword $(PRODUCT_SOONG_DEFINED_SYSTEM_IMAGE_AVB_KEY_PATH) $(BOARD_AVB_SYSTEM_KEY_PATH))" >> $(1)$(newline)) \

    $(if $(PRODUCT_SOONG_DEFINED_SYSTEM_IMAGE_AVB_ALGORITHM)$(BOARD_AVB_SYSTEM_ALGORITHM),\

      $(hide) echo "avb_system_other_algorithm=$(firstword $(PRODUCT_SOONG_DEFINED_SYSTEM_IMAGE_AVB_ALGORITHM) $(BOARD_AVB_SYSTEM_ALGORITHM))" >> $(1)$(newline))) \

  $(if $(filter $(2),vendor), \

    $(hide) echo "avb_vendor_hashtree_enable=$(BOARD_AVB_ENABLE)" >> $(1)$(newline) \

    $(hide) echo "avb_vendor_add_hashtree_footer_args=$(BOARD_AVB_VENDOR_ADD_HASHTREE_FOOTER_ARGS)" >> $(1)$(newline) \
@@ -3658,6 +3659,10 @@ $(eval $(call write-partition-file-list,$(systemimage_intermediates)/file_list.t 
ifneq ($(PRODUCT_SOONG_DEFINED_SYSTEM_IMAGE),)

file_list_diff := $(HOST_OUT_EXECUTABLES)/file_list_diff$(HOST_EXECUTABLE_SUFFIX)

system_file_diff_timestamp := $(systemimage_intermediates)/file_diff.timestamp

# Override system's avb_key with the avb_key of the soong defined system image.

# This will be used as the avb_key to sign system_other.img

PRODUCT_SOONG_DEFINED_SYSTEM_IMAGE_AVB_KEY_PATH := $(ALL_MODULES.$(PRODUCT_SOONG_DEFINED_SYSTEM_IMAGE).FILESYSTEM_AVB_KEY_PATH)

PRODUCT_SOONG_DEFINED_SYSTEM_IMAGE_AVB_ALGORITHM := $(ALL_MODULES.$(PRODUCT_SOONG_DEFINED_SYSTEM_IMAGE).FILESYSTEM_AVB_ALGORITHM)



# The build configuration to build the REL version may have more files to allow.

# Use allowlist_next in addition to the allowlist in this case.

core/base_rules.mk

+10 −0
Original line number Diff line number Diff line
@@ -1080,6 +1080,16 @@ ifdef LOCAL_FILESYSTEM_FILELIST 
      $(ALL_MODULES.$(my_register_name).FILESYSTEM_FILELIST) $(LOCAL_FILESYSTEM_FILELIST)

endif



ifdef LOCAL_FILESYSTEM_AVB_KEY_PATH

  ALL_MODULES.$(my_register_name).FILESYSTEM_AVB_KEY_PATH := \

      $(ALL_MODULES.$(my_register_name).FILESYSTEM_AVB_KEY_PATH) $(LOCAL_FILESYSTEM_AVB_KEY_PATH)

endif



ifdef LOCAL_FILESYSTEM_AVB_ALGORITHM

  ALL_MODULES.$(my_register_name).FILESYSTEM_AVB_ALGORITHM := \

      $(ALL_MODULES.$(my_register_name).FILESYSTEM_AVB_ALGORITHM) $(LOCAL_FILESYSTEM_AVB_ALGORITHM)

endif



ifndef LOCAL_SOONG_MODULE_INFO_JSON

  ALL_MAKE_MODULE_INFO_JSON_MODULES += $(my_register_name)

  ALL_MODULES.$(my_register_name).SHARED_LIBS := \

core/clear_vars.mk

+1 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ LOCAL_EXTRA_FULL_TEST_CONFIGS:= 
LOCAL_EXTRACT_APK:=

LOCAL_EXTRACT_DPI_APK:=

LOCAL_FILESYSTEM_FILELIST:=

LOCAL_FILESYSTEM_AVB_KEY_PATH:=

LOCAL_FINDBUGS_FLAGS:=

LOCAL_FORCE_STATIC_EXECUTABLE:=

LOCAL_FULL_CLASSES_JACOCO_JAR:=