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

Commit 8fdb9fb3 authored by Jooyung Han's avatar Jooyung Han Committed by Automerger Merge Worker
Browse files

Merge "Rewrite how to generate apexkeys.txt" into main am: aea4c9d4 

Original change: https://android-review.googlesource.com/c/platform/build/+/2809200



Change-Id: I7b4f5bf34b61effe84d8c90e62d23aac785b0b68
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e9bf4c6f aea4c9d4

core/Makefile

+20 −4
Original line number Diff line number Diff line
@@ -793,9 +793,25 @@ $(call declare-0p-target,$(APKCERTS_FILE)) 
.PHONY: apkcerts-list

apkcerts-list: $(APKCERTS_FILE)



intermediates := $(call intermediates-dir-for,PACKAGING,apexkeys)

APEX_KEYS_FILE := $(intermediates)/apexkeys.txt



all_apex_keys_files := $(sort $(foreach m,$(call product-installed-modules,$(INTERNAL_PRODUCT)),$(ALL_MODULES.$(m).APEX_KEYS_FILE)))

$(APEX_KEYS_FILE): $(all_apex_keys_files)

	@mkdir -p $(dir $@)

	@rm -f $@

	$(hide) touch $@

	$(hide) $(foreach file,$^,cat $(file) >> $@ $(newline))

all_apex_keys_files :=



$(call declare-0p-target,$(APEX_KEYS_FILE))



.PHONY: apexkeys.txt

apexkeys.txt: $(APEX_KEYS_FILE)



ifneq (,$(TARGET_BUILD_APPS))

  $(call dist-for-goals, apps_only, $(APKCERTS_FILE):apkcerts.txt)

  $(call dist-for-goals, apps_only, $(SOONG_APEX_KEYS_FILE):apexkeys.txt)

  $(call dist-for-goals, apps_only, $(APEX_KEYS_FILE):apexkeys.txt)

endif
@@ -6339,7 +6355,7 @@ $(BUILT_TARGET_FILES_DIR): \ 
	    $(INSTALLED_MISC_INFO_TARGET) \

	    $(INSTALLED_FASTBOOT_INFO_TARGET) \

	    $(APKCERTS_FILE) \

	    $(SOONG_APEX_KEYS_FILE) \

	    $(APEX_KEYS_FILE) \

	    $(SOONG_ZIP) \

	    $(HOST_OUT_EXECUTABLES)/fs_config \

	    $(HOST_OUT_EXECUTABLES)/map_file_generator \
@@ -6550,7 +6566,7 @@ endif 
	@# build them.

	$(hide) mkdir -p $(zip_root)/META

	$(hide) cp $(APKCERTS_FILE) $(zip_root)/META/apkcerts.txt

	$(hide) cp $(SOONG_APEX_KEYS_FILE) $(zip_root)/META/apexkeys.txt

	$(hide) cp $(APEX_KEYS_FILE) $(zip_root)/META/apexkeys.txt

ifneq ($(tool_extension),)

	$(hide) cp $(PRIVATE_TOOL_EXTENSION) $(zip_root)/META/

endif
@@ -6813,7 +6829,7 @@ $(call declare-container-license-deps,$(BUILT_TARGET_FILES_PACKAGE), $(INSTALLED 
            $(INSTALLED_MISC_INFO_TARGET) \

            $(INSTALLED_FASTBOOT_INFO_TARGET) \

            $(APKCERTS_FILE) \

            $(SOONG_APEX_KEYS_FILE) \

            $(APEX_KEYS_FILE) \

            $(HOST_OUT_EXECUTABLES)/fs_config \

            $(HOST_OUT_EXECUTABLES)/map_file_generator \

            $(ADD_IMG_TO_TARGET_FILES) \

core/base_rules.mk

+1 −0
Original line number Diff line number Diff line
@@ -1180,6 +1180,7 @@ ALL_MODULES.$(my_register_name).EXTRA_TEST_CONFIGS := $(LOCAL_EXTRA_FULL_TEST_CO 
ALL_MODULES.$(my_register_name).TEST_MAINLINE_MODULES := $(LOCAL_TEST_MAINLINE_MODULES)

ifndef LOCAL_IS_HOST_MODULE

ALL_MODULES.$(my_register_name).FILE_CONTEXTS := $(LOCAL_FILE_CONTEXTS)

ALL_MODULES.$(my_register_name).APEX_KEYS_FILE := $(LOCAL_APEX_KEY_PATH)

endif

ifdef LOCAL_IS_UNIT_TEST

ALL_MODULES.$(my_register_name).IS_UNIT_TEST := $(LOCAL_IS_UNIT_TEST)

core/clear_vars.mk

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ LOCAL_AIDL_INCLUDES:= 
LOCAL_ALLOW_UNDEFINED_SYMBOLS:=

LOCAL_ANNOTATION_PROCESSORS:=

LOCAL_ANNOTATION_PROCESSOR_CLASSES:=

LOCAL_APEX_KEY_PATH:=

LOCAL_APIDIFF_NEWAPI:=

LOCAL_APIDIFF_OLDAPI:=

LOCAL_APK_LIBRARIES:=