tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Dist proguard dictionaries for platform builds" am: c2ecd76a0b am: 26296995af am: 87f8d0a875 am: dd9aa4d64a

Browse source 
am: b7c650202e

Change-Id: If66009bf834a022178be10a49909bac03fa566d5
This commit is contained in:
Colin Cross 2019-09-06 10:03:43 -07:00 committed by android-build-merger
commit 3034d48d1a
2 changed files with 20 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
core/Makefile
View file

@ -4494,25 +4494,28 @@ endif # EMMA_INSTRUMENT=true
#------------------------------------------------------------------ #------------------------------------------------------------------
# A zip of Proguard obfuscation dictionary files. # A zip of Proguard obfuscation dictionary files.
# Only for apps_only build.
# #
ifdef TARGET_BUILD_APPS
PROGUARD_DICT_ZIP := $(PRODUCT_OUT)/$(TARGET_PRODUCT)-proguard-dict-$(FILE_NAME_TAG).zip PROGUARD_DICT_ZIP := $(PRODUCT_OUT)/$(TARGET_PRODUCT)-proguard-dict-$(FILE_NAME_TAG).zip
# the dependency will be set up later in build/make/core/main.mk. # For apps_only build we'll establish the dependency later in build/make/core/main.mk.
$(PROGUARD_DICT_ZIP) : ifndef TARGET_BUILD_APPS
$(PROGUARD_DICT_ZIP): \
$(INSTALLED_SYSTEMIMAGE_TARGET) \
$(INSTALLED_RAMDISK_TARGET) \
$(INSTALLED_BOOTIMAGE_TARGET) \
$(INSTALLED_USERDATAIMAGE_TARGET) \
$(INSTALLED_VENDORIMAGE_TARGET) \
$(INSTALLED_PRODUCTIMAGE_TARGET) \
$(INSTALLED_SYSTEM_EXTIMAGE_TARGET) \
$(INSTALLED_ODMIMAGE_TARGET) \
$(updater_dep)
endif
$(PROGUARD_DICT_ZIP): PRIVATE_LIST_FILE := $(call intermediates-dir-for,PACKAGING,proguard)/filelist
$(PROGUARD_DICT_ZIP): $(SOONG_ZIP)
@echo "Packaging Proguard obfuscation dictionary files." @echo "Packaging Proguard obfuscation dictionary files."
$(hide) dict_files=`find $(TARGET_OUT_COMMON_INTERMEDIATES)/APPS -name proguard_dictionary`; \ mkdir -p $(dir $@) $(TARGET_OUT_COMMON_INTERMEDIATES)/APPS $(dir $(PRIVATE_LIST_FILE))
if [ -n "$$dict_files" ]; then \ find $(TARGET_OUT_COMMON_INTERMEDIATES)/APPS -name proguard_dictionary | \
unobfuscated_jars=$${dict_files//proguard_dictionary/classes.jar}; \ sed -e 's/\(.*\)\/proguard_dictionary/\0\n\1\/classes.jar/' > $(PRIVATE_LIST_FILE)
zip -qX $@ $$dict_files $$unobfuscated_jars; \ $(SOONG_ZIP) --ignore_missing_files -d -o $@ -C $(OUT_DIR)/.. -l $(PRIVATE_LIST_FILE)
else \
touch $(dir $@)/zipdummy; \
(cd $(dir $@) && zip -q $(notdir $@) zipdummy); \
zip -qd $@ zipdummy; \
rm $(dir $@)/zipdummy; \
fi
endif # TARGET_BUILD_APPS
ifeq (true,$(PRODUCT_USE_DYNAMIC_PARTITIONS)) ifeq (true,$(PRODUCT_USE_DYNAMIC_PARTITIONS))

1
core/main.mk
View file

@ -1663,6 +1663,7 @@ else # TARGET_BUILD_APPS
$(INTERNAL_OTA_RETROFIT_DYNAMIC_PARTITIONS_PACKAGE_TARGET) \ $(INTERNAL_OTA_RETROFIT_DYNAMIC_PARTITIONS_PACKAGE_TARGET) \
$(BUILT_OTATOOLS_PACKAGE) \ $(BUILT_OTATOOLS_PACKAGE) \
$(SYMBOLS_ZIP) \ $(SYMBOLS_ZIP) \
$(PROGUARD_DICT_ZIP) \
$(COVERAGE_ZIP) \ $(COVERAGE_ZIP) \
$(APPCOMPAT_ZIP) \ $(APPCOMPAT_ZIP) \
$(INSTALLED_FILES_FILE) \ $(INSTALLED_FILES_FILE) \