diff options
| author | Ying Wang <wangying@google.com> | 2013-08-23 10:13:19 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-08-23 10:13:19 -0700 |
| commit | 06de9f940c34b8ade1f1866fbc1c6b32f93277b4 (patch) | |
| tree | 43e7e7470557e43beb780b294b7b7275d831e164 /core | |
| parent | aa87a11dffec0ea58c93ab0dd23b067975a4c681 (diff) | |
| parent | 8709497ed82800f399e99516df59afdb1bae8472 (diff) | |
| download | build-06de9f940c34b8ade1f1866fbc1c6b32f93277b4.zip build-06de9f940c34b8ade1f1866fbc1c6b32f93277b4.tar.gz build-06de9f940c34b8ade1f1866fbc1c6b32f93277b4.tar.bz2 | |
am 8709497e: Merge "Revert "Collect and store proguard obfuscation dictionary files."" into jb-mr2-dev
* commit '8709497ed82800f399e99516df59afdb1bae8472':
Revert "Collect and store proguard obfuscation dictionary files."
Diffstat (limited to 'core')
| -rw-r--r-- | core/Makefile | 18 | ||||
| -rw-r--r-- | core/main.mk | 3 |
2 files changed, 0 insertions, 21 deletions
diff --git a/core/Makefile b/core/Makefile index 43dcf51..55ab6a5 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1391,24 +1391,6 @@ $(EMMA_META_ZIP) : 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 .PHONY: dalvikfiles diff --git a/core/main.mk b/core/main.mk index 3af4306..282d9c3 100644 --- a/core/main.mk +++ b/core/main.mk @@ -819,9 +819,6 @@ ifneq ($(TARGET_BUILD_APPS),) $(call dist-for-goals,apps_only, $(EMMA_META_ZIP)) endif - $(PROGUARD_DICT_ZIP) : $(apps_only_installed_files) - $(call dist-for-goals,apps_only, $(PROGUARD_DICT_ZIP)) - .PHONY: apps_only apps_only: $(unbundled_build_modules) |