commit 665ebbe471c1789c12b31e06dfba67c2bef5891d
author Colin Cross <ccross@android.com> Thu Oct 31 19:14:03 2019 -0700
committer Colin Cross <ccross@android.com> Fri Nov 01 13:35:17 2019 -0700
tree 0e9e58e7a9cb268132570f645480be2b7268557c
parent f0add55066f76e62fc1781f4c2b9ea8fd8ede269

Fix turbine classpath arguments in Make

We were passing "--classpath foo.jar --classpath bar.jar" to turbine,
it now wants (and may always have expected?)
"--classpath foo.jar bar.jar".

This is equivalent to Ib7e0ca64a34e236110f7b785d6a0fb51ed75567e in
Soong.

Test: m java
Change-Id: I061ebf302a215c66b1923056716b60bf0160d9bc

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 \