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

Commit c894e099 authored by Ying Wang's avatar Ying Wang
Browse files

resolved conflicts for merge of 641e283f to master 

Change-Id: I9c5d9dd9f0f8c9206112f4c2f773ed81c9c2f06f
parents 7a9e3884 641e283f

core/Makefile

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

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

		else \

		  touch $(dir $@)/dummy; \

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

		  zip -qd $@ dummy; \

		  rm $(dir $@)/dummy; \

		  touch $(dir $@)/zipdummy; \

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

		  zip -qd $@ zipdummy; \

		  rm $(dir $@)/zipdummy; \

		fi



endif # TARGET_BUILD_APPS

core/definitions.mk

+4 −4
Original line number Diff line number Diff line
@@ -1959,10 +1959,10 @@ endef 
# $(1) package to create

define create-empty-package-at

@mkdir -p $(dir $(1))

$(hide) touch $(dir $(1))dummy

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

$(hide) zip -qd $(1) dummy

$(hide) rm $(dir $(1))dummy

$(hide) touch $(dir $(1))zipdummy

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

$(hide) zip -qd $(1) zipdummy

$(hide) rm $(dir $(1))zipdummy

endef



# Create a mostly-empty .jar file that we'll add to later.