diff options
| author | Ying Wang <wangying@google.com> | 2013-08-23 12:16:16 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-08-23 12:16:16 -0700 |
| commit | ddce2eb007c97b8ca94bc7b3190a83006df0c187 (patch) | |
| tree | f3fd6453c4586ac74e65e21b248642c712729782 /core | |
| parent | 653a037d70d770d2fc03d4f205a9c626af5f5c76 (diff) | |
| parent | de32713f47b33c6d4c0bb4c8943e1eccf81aa0c5 (diff) | |
| download | build-ddce2eb007c97b8ca94bc7b3190a83006df0c187.zip build-ddce2eb007c97b8ca94bc7b3190a83006df0c187.tar.gz build-ddce2eb007c97b8ca94bc7b3190a83006df0c187.tar.bz2 | |
am de32713f: Merge "Collect and store proguard obfuscation dictionary files." into jb-mr2-dev
* commit 'de32713f47b33c6d4c0bb4c8943e1eccf81aa0c5':
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, 21 insertions, 0 deletions
diff --git a/core/Makefile b/core/Makefile index 55ab6a5..6c57a49 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1391,6 +1391,24 @@ $(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=`find $(TARGET_OUT_COMMON_INTERMEDIATES)/APPS -name proguard_dictionary`; \ + if [ -n "$$dict_files" ]; then \ + zip -q $@ $$dict_files; \ + else \ + touch $@; \ + fi + +endif # TARGET_BUILD_APPS + # ----------------------------------------------------------------- # dalvik something .PHONY: dalvikfiles diff --git a/core/main.mk b/core/main.mk index 282d9c3..3af4306 100644 --- a/core/main.mk +++ b/core/main.mk @@ -819,6 +819,9 @@ 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) |