tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Sort dex and static lib resources"

Browse source 
am: 67d993fc9c

* commit '67d993fc9cd01950f8994b7613362ea749be561a':
  Sort dex and static lib resources
This commit is contained in:
Dan Willemsen 2015-11-13 01:44:44 +00:00 committed by android-build-merger
commit aa725f6769
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/definitions.mk
View file

@ -2099,7 +2099,7 @@ endef
#TODO: update the manifest to point to the dex file #TODO: update the manifest to point to the dex file
define add-dex-to-package define add-dex-to-package
$(hide) zip -qjX $@ $(dir $(PRIVATE_DEX_FILE))classes*.dex $(hide) find $(dir $(PRIVATE_DEX_FILE)) -maxdepth 1 -name "classes*.dex" | sort | xargs zip -qjX $@
endef endef
# Add java resources added by the current module. # Add java resources added by the current module.
@ -2115,7 +2115,7 @@ endef
# #
define add-carried-jack-resources define add-carried-jack-resources
$(hide) if [ -d $(PRIVATE_JACK_INTERMEDIATES_DIR) ] ; then \ $(hide) if [ -d $(PRIVATE_JACK_INTERMEDIATES_DIR) ] ; then \
find $(PRIVATE_JACK_INTERMEDIATES_DIR) -type f \ find $(PRIVATE_JACK_INTERMEDIATES_DIR) -type f | sort \
| sed -e "s?^$(PRIVATE_JACK_INTERMEDIATES_DIR)/? -C \"$(PRIVATE_JACK_INTERMEDIATES_DIR)\" \"?" -e "s/$$/\"/" \ | sed -e "s?^$(PRIVATE_JACK_INTERMEDIATES_DIR)/? -C \"$(PRIVATE_JACK_INTERMEDIATES_DIR)\" \"?" -e "s/$$/\"/" \
> $(dir $@)jack_res_jar_flags; \ > $(dir $@)jack_res_jar_flags; \
if [ -s $(dir $@)jack_res_jar_flags ] ; then \ if [ -s $(dir $@)jack_res_jar_flags ] ; then \