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

Commit 26919ea5 authored by Jiyong Park's avatar Jiyong Park Committed by android-build-merger
Browse files

Merge "Install apexkeys.txt into the target-files package"

am: eb0bbdc8

Change-Id: Ie182fa94a420ab9dc3dd9b55544e05f958cd8b60
parents 8ef0dae2 eb0bbdc8
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -690,8 +690,10 @@ apkcerts-list: $(APKCERTS_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)
endif


# -----------------------------------------------------------------
# build system stats
BUILD_SYSTEM_STATS := $(PRODUCT_OUT)/build_system_stats.txt
@@ -3650,6 +3652,7 @@ $(BUILT_TARGET_FILES_PACKAGE): \
	    $(LPMAKE) \
	    $(SELINUX_FC) \
	    $(APKCERTS_FILE) \
	    $(SOONG_APEX_KEYS_FILE) \
	    $(SOONG_ZIP) \
	    $(HOST_OUT_EXECUTABLES)/fs_config \
	    $(HOST_OUT_EXECUTABLES)/imgdiff \
@@ -3783,6 +3786,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
ifneq ($(tool_extension),)
	$(hide) cp $(PRIVATE_TOOL_EXTENSION) $(zip_root)/META/
endif