commit 3bfecc8b6510fe7630d2998b927a74a28e5951d0
author Ying Wang <wangying@android.com> Wed Oct 14 23:08:53 2015 +0000
committer Ying Wang <wangying@android.com> Wed Oct 14 23:08:53 2015 +0000
tree 2dc75143d66b3a74623950fb0fbe230afb681850
parent 16f93d5661afe23229ab3b08ddd5fde9bc9c7eb8

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

This reverts commit 16f93d5661afe23229ab3b08ddd5fde9bc9c7eb8.

Change-Id: I925dae6a2d07792c61fcd3b6fd8718391ab993f8

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index 58d191f..5e45e1f 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 \
-    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; \
+    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; \
     fi; \
 fi
 endef