StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ying Wang
2015-10-14 21:43:41 +00:00
committed by Gerrit Code Review
parent f635a586e8 16f93d5661
commit 3757268466
1 changed files with 5 additions and 5 deletions
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 \
jack_res_jar_flags=$$(find $(PRIVATE_JACK_INTERMEDIATES_DIR) -type f \ 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) ?" \
if [ -n "$$jack_res_jar_flags" ] ; then \ > $(dir $@)jack_res_jar_flags; \
echo $$jack_res_jar_flags >$(dir $@)jack_res_jar_flags; \ if [ -s $(dir $@)jack_res_jar_flags ] ; then \
jar uf $@ $$jack_res_jar_flags; \ jar uf $@ @$(dir $@)jack_res_jar_flags; \
fi; \ fi; \
fi fi
endef endef