StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Treehugger Robot
2019-02-20 01:53:44 +00:00
committed by Gerrit Code Review
parent 93030e3f4d bcc8d8a2d4
commit eb0bbdc89a
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/Makefile
View File

@@ -690,8 +690,10 @@ apkcerts-list: $(APKCERTS_FILE)
ifneq (,$(TARGET_BUILD_APPS)) ifneq (,$(TARGET_BUILD_APPS))
$(call dist-for-goals, apps_only, $(APKCERTS_FILE):apkcerts.txt) $(call dist-for-goals, apps_only, $(APKCERTS_FILE):apkcerts.txt)
$(call dist-for-goals, apps_only, $(SOONG_APEX_KEYS_FILE):apexkeys.txt)
endif endif
# ----------------------------------------------------------------- # -----------------------------------------------------------------
# build system stats # build system stats
BUILD_SYSTEM_STATS := $(PRODUCT_OUT)/build_system_stats.txt BUILD_SYSTEM_STATS := $(PRODUCT_OUT)/build_system_stats.txt
@@ -3650,6 +3652,7 @@ $(BUILT_TARGET_FILES_PACKAGE): \
$(LPMAKE) \ $(LPMAKE) \
$(SELINUX_FC) \ $(SELINUX_FC) \
$(APKCERTS_FILE) \ $(APKCERTS_FILE) \
$(SOONG_APEX_KEYS_FILE) \
$(SOONG_ZIP) \ $(SOONG_ZIP) \
$(HOST_OUT_EXECUTABLES)/fs_config \ $(HOST_OUT_EXECUTABLES)/fs_config \
$(HOST_OUT_EXECUTABLES)/imgdiff \ $(HOST_OUT_EXECUTABLES)/imgdiff \
@@ -3783,6 +3786,7 @@ endif
@# build them. @# build them.
$(hide) mkdir -p $(zip_root)/META $(hide) mkdir -p $(zip_root)/META
$(hide) cp $(APKCERTS_FILE) $(zip_root)/META/apkcerts.txt $(hide) cp $(APKCERTS_FILE) $(zip_root)/META/apkcerts.txt
$(hide) cp $(SOONG_APEX_KEYS_FILE) $(zip_root)/META/apexkeys.txt
ifneq ($(tool_extension),) ifneq ($(tool_extension),)
$(hide) cp $(PRIVATE_TOOL_EXTENSION) $(zip_root)/META/ $(hide) cp $(PRIVATE_TOOL_EXTENSION) $(zip_root)/META/
endif endif