commit ee299938bf67772efa38544cd2b4475e3fe7269f
author Ying Wang <wangying@android.com> Wed Oct 14 21:56:38 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 14 21:56:38 2015 +0000
tree 5edc03b8b360d5bd0bc7060208ece4213d6e8323
parent b568c7a8fa6422227f64b51e2d219bc0f087c4a0
parent 5d012538fbebf44a97539e0430f7190c016d2a4c

am 5d012538: am 37572684: Merge "Use @arg-lsit-file for jar in add-carried-jack-resources"

* commit '5d012538fbebf44a97539e0430f7190c016d2a4c':
  Use @arg-lsit-file for jar in add-carried-jack-resources

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index edcc1b2..c179706 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -2105,11 +2105,11 @@
 #
 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