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

Commit 16f93d56 authored by Ying Wang's avatar Ying Wang
Browse files

Use @arg-lsit-file for jar in add-carried-jack-resources 

Don't pass the arg list as argument in any bash command;
Instead store the arg list to the arg list file and
run "jar @arg-lsit-file".

This fixed "argument list too long" build error on Mac.

Bug: 24789595
Change-Id: I3e5cd18fd988f12f0876b152b8bf07d07b56119e
parent f698ca63

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) ?" \

        > $(dir $@)jack_res_jar_flags; \

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

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

    fi; \

fi

endef