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

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

Browse source
This commit is contained in:
Ying Wang 2015-10-14 23:09:14 +00:00 committed by Gerrit Code Review
commit ed4b0eeb43
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
core/definitions.mk
View file

@ -2105,11 +2105,11 @@ 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 \ jack_res_jar_flags=$$(find $(PRIVATE_JACK_INTERMEDIATES_DIR) -type f \
| sed -e "s?^$(PRIVATE_JACK_INTERMEDIATES_DIR)/? -C $(PRIVATE_JACK_INTERMEDIATES_DIR) ?" \ | sed -e "s?^$(PRIVATE_JACK_INTERMEDIATES_DIR)/? -C $(PRIVATE_JACK_INTERMEDIATES_DIR) ?"); \
> $(dir $@)jack_res_jar_flags; \ if [ -n "$$jack_res_jar_flags" ] ; then \
if [ -s $(dir $@)jack_res_jar_flags ] ; then \ echo $$jack_res_jar_flags >$(dir $@)jack_res_jar_flags; \
jar uf $@ @$(dir $@)jack_res_jar_flags; \ jar uf $@ $$jack_res_jar_flags; \
fi; \ fi; \
fi fi
endef endef