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

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

am 4eec22a6: Merge "Use a less freqent dummy file name: zipdummy" 

* commit '4eec22a6':
  Use a less freqent dummy file name: zipdummy
parents e886392c 4eec22a6

core/Makefile

+4 −4
Original line number Original line Diff line number Diff line
@@ -1560,10 +1560,10 @@ $(PROGUARD_DICT_ZIP) : 
		  unobfuscated_jars=$${dict_files//proguard_dictionary/classes.jar}; \

		  unobfuscated_jars=$${dict_files//proguard_dictionary/classes.jar}; \

		  zip -q $@ $$dict_files $$unobfuscated_jars; \

		  zip -q $@ $$dict_files $$unobfuscated_jars; \

		else \

		else \

		  touch $(dir $@)/dummy; \

		  touch $(dir $@)/zipdummy; \

		  (cd $(dir $@) && zip -q $(notdir $@) dummy); \

		  (cd $(dir $@) && zip -q $(notdir $@) zipdummy); \

		  zip -qd $@ dummy; \

		  zip -qd $@ zipdummy; \

		  rm $(dir $@)/dummy; \

		  rm $(dir $@)/zipdummy; \

		fi

		fi





endif # TARGET_BUILD_APPS

endif # TARGET_BUILD_APPS

core/definitions.mk

+4 −4
Original line number Original line Diff line number Diff line
@@ -1779,10 +1779,10 @@ endef 
# so we need to give it something.

# so we need to give it something.

define create-empty-package

define create-empty-package

@mkdir -p $(dir $@)

@mkdir -p $(dir $@)

$(hide) touch $(dir $@)dummy

$(hide) touch $(dir $@)zipdummy

$(hide) (cd $(dir $@) && jar cf $(notdir $@) dummy)

$(hide) (cd $(dir $@) && jar cf $(notdir $@) zipdummy)

$(hide) zip -qd $@ dummy

$(hide) zip -qd $@ zipdummy

$(hide) rm $(dir $@)dummy

$(hide) rm $(dir $@)zipdummy

endef

endef





# Copy an arhchive file and delete any class files and empty folders inside.

# Copy an arhchive file and delete any class files and empty folders inside.