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

Commit 786dc640 authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge "Sort dex and static lib resources" am: 67d993fc 

am: aa725f67

* commit 'aa725f67':
  Sort dex and static lib resources
parents 934f9fec aa725f67

core/definitions.mk

+2 −2
Original line number Diff line number Diff line
@@ -2099,7 +2099,7 @@ endef 


#TODO: update the manifest to point to the dex file

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



# Add java resources added by the current module.
@@ -2115,7 +2115,7 @@ endef 
#

define add-carried-jack-resources

 $(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/$$/\"/" \

        > $(dir $@)jack_res_jar_flags; \

    if [ -s $(dir $@)jack_res_jar_flags ] ; then \