forked from openkylin/platform_build
am 2363485c: am 06de9f94: am 8709497e: Merge "Revert "Collect and store proguard obfuscation dictionary files."" into jb-mr2-dev
* commit '2363485c2fb3f08d36e8cdbb2240b9c3993b470c': Revert "Collect and store proguard obfuscation dictionary files."
This commit is contained in:
commit
c3e977acf1
|
@ -1420,24 +1420,6 @@ $(EMMA_META_ZIP) :
|
||||||
|
|
||||||
endif # EMMA_INSTRUMENT=true
|
endif # EMMA_INSTRUMENT=true
|
||||||
|
|
||||||
#------------------------------------------------------------------
|
|
||||||
# A zip of Proguard obfuscation dictionary files.
|
|
||||||
# Only for apps_only build.
|
|
||||||
#
|
|
||||||
ifdef TARGET_BUILD_APPS
|
|
||||||
PROGUARD_DICT_ZIP := $(PRODUCT_OUT)/proguard-dict-$(FILE_NAME_TAG).zip
|
|
||||||
# the dependency will be set up later in build/core/main.mk.
|
|
||||||
$(PROGUARD_DICT_ZIP) :
|
|
||||||
@echo "Packaging proguard obfuscation dictionary files."
|
|
||||||
$(hide) dict_files="$(TARGET_OUT_COMMON_INTERMEDIATES)/APPS/*/proguard_dictionary"; \
|
|
||||||
if [ -n "$$dict_files" ]; then \
|
|
||||||
zip $@ $$dict_files; \
|
|
||||||
else \
|
|
||||||
touch $@; \
|
|
||||||
fi
|
|
||||||
|
|
||||||
endif # TARGET_BUILD_APPS
|
|
||||||
|
|
||||||
# -----------------------------------------------------------------
|
# -----------------------------------------------------------------
|
||||||
# dalvik something
|
# dalvik something
|
||||||
.PHONY: dalvikfiles
|
.PHONY: dalvikfiles
|
||||||
|
|
|
@ -828,9 +828,6 @@ ifneq ($(TARGET_BUILD_APPS),)
|
||||||
$(call dist-for-goals,apps_only, $(EMMA_META_ZIP))
|
$(call dist-for-goals,apps_only, $(EMMA_META_ZIP))
|
||||||
endif
|
endif
|
||||||
|
|
||||||
$(PROGUARD_DICT_ZIP) : $(apps_only_installed_files)
|
|
||||||
$(call dist-for-goals,apps_only, $(PROGUARD_DICT_ZIP))
|
|
||||||
|
|
||||||
.PHONY: apps_only
|
.PHONY: apps_only
|
||||||
apps_only: $(unbundled_build_modules)
|
apps_only: $(unbundled_build_modules)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue