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

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

am 2363485c: am 06de9f94: am 8709497e: Merge "Revert "Collect and store... 

am 2363485c: am 06de9f94: am 8709497e: Merge "Revert "Collect and store proguard obfuscation dictionary files."" into jb-mr2-dev

* commit '2363485c':
  Revert "Collect and store proguard obfuscation dictionary files."
parents 58ad7061 2363485c

core/Makefile

+0 −18
Original line number Diff line number Diff line
@@ -1420,24 +1420,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

core/main.mk

+0 −3
Original line number Diff line number Diff line
@@ -828,9 +828,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)