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

Commit 94f86f88 authored by Yohann Roussel's avatar Yohann Roussel
Browse files

Sort dex and static lib resources 

Before adding them to the apk or javalib.jar. This allows the entries
order to be reproducible and will help to have a reproducible build.

Bug: 25629246

Change-Id: Ie596aecfdd08047ea9f9071896a2b980e7200b41
parent 5dd68067

core/definitions.mk

+2 −2
Original line number Diff line number Diff line
@@ -2100,7 +2100,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.
@@ -2116,7 +2116,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 \