commit 9c28a4a15cff994c4ff43d49d5a519bda04ba9ef
author Colin Cross <ccross@android.com> Fri Nov 08 15:07:44 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Nov 08 15:07:44 2019 +0000
tree 30e6de95d7f2e96784b8bbbb74a1871705ead0ce
parent c91616fabdac86168e1a13e4763eb323ad8ce6e0
parent 665ebbe471c1789c12b31e06dfba67c2bef5891d

Merge "Fix turbine classpath arguments in Make"

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index eb3e612a..8eb1142 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -2101,10 +2101,10 @@
     --javacopts $(PRIVATE_JAVACFLAGS) $(COMMON_JDK_FLAGS) -- \
     $(if $(PRIVATE_USE_SYSTEM_MODULES), \
       --system $(PRIVATE_SYSTEM_MODULES_DIR), \
-      $(addprefix --bootclasspath ,$(strip $(PRIVATE_BOOTCLASSPATH)))) \
-    $(addprefix --classpath ,$(strip $(if $(PRIVATE_USE_SYSTEM_MODULES), \
+      --bootclasspath $(strip $(PRIVATE_BOOTCLASSPATH))) \
+    --classpath $(strip $(if $(PRIVATE_USE_SYSTEM_MODULES), \
         $(filter-out $(PRIVATE_SYSTEM_MODULES_LIBS),$(PRIVATE_BOOTCLASSPATH))) \
-      $(PRIVATE_ALL_JAVA_HEADER_LIBRARIES))) \
+      $(PRIVATE_ALL_JAVA_HEADER_LIBRARIES)) \
     || ( rm -rf $(dir $@)/classes-turbine ; exit 41 ) && \
     $(MERGE_ZIPS) -j --ignore-duplicates -stripDir META-INF $@.tmp $@.premerged $(PRIVATE_STATIC_JAVA_HEADER_LIBRARIES) ; \
 else \