Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ddce2eb0 authored by Ying Wang's avatar Ying Wang Committed by Android Git Automerger
Browse files

am de32713f: Merge "Collect and store proguard obfuscation dictionary files." into jb-mr2-dev

* commit 'de32713f':
  Collect and store proguard obfuscation dictionary files.
parents 653a037d de32713f
Loading
Loading
Loading
Loading
+18 −0
Original line number Diff line number Diff line
@@ -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
+3 −0
Original line number Diff line number Diff line
@@ -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)