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

Commit 8c6af7ba authored by Ying Wang's avatar Ying Wang Committed by Android Git Automerger
Browse files

am ef67c196: am 84c5ae52: Merge "Use @arg-lsit-file for jar in add-carried-jack-resources" 

* commit 'ef67c196':
  Use @arg-lsit-file for jar in add-carried-jack-resources
parents 927f00d4 ef67c196

core/definitions.mk

+5 −5
Original line number Diff line number Diff line
@@ -2105,11 +2105,11 @@ endef 
#

define add-carried-jack-resources

 $(hide) if [ -d $(PRIVATE_JACK_INTERMEDIATES_DIR) ] ; then \

    jack_res_jar_flags=$$(find $(PRIVATE_JACK_INTERMEDIATES_DIR) -type f \

        | sed -e "s?^$(PRIVATE_JACK_INTERMEDIATES_DIR)/? -C $(PRIVATE_JACK_INTERMEDIATES_DIR) ?"); \

    if [ -n "$$jack_res_jar_flags" ] ; then \

        echo $$jack_res_jar_flags >$(dir $@)jack_res_jar_flags; \

        jar uf $@ $$jack_res_jar_flags; \

    find $(PRIVATE_JACK_INTERMEDIATES_DIR) -type f \

        | 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 \

        jar uf $@ @$(dir $@)jack_res_jar_flags; \

    fi; \

fi

endef