commit dd386dc9ac7ea677ea117c366daf96d93c1e2cd8
author Colin Cross <ccross@android.com> Mon Nov 04 18:54:32 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Nov 04 18:54:32 2019 +0000
tree 9c7eb641ce17cf0ee6e276ee7d2de5059b6c0680
parent 6dc79ada3dafbad1f49b3d185aa6950ea233533a
parent f0add55066f76e62fc1781f4c2b9ea8fd8ede269

Merge "Use system modules for turbine in Make"

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index 1bf7fa9..eb3e612a 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -2099,8 +2099,12 @@
     --output $@.premerged --temp_dir $(dir $@)/classes-turbine \
     --sources \@$(PRIVATE_JAVA_SOURCE_LIST) --source_jars $(PRIVATE_SRCJARS) \
     --javacopts $(PRIVATE_JAVACFLAGS) $(COMMON_JDK_FLAGS) -- \
-    $(addprefix --bootclasspath ,$(strip $(PRIVATE_BOOTCLASSPATH))) \
-    $(addprefix --classpath ,$(strip $(PRIVATE_ALL_JAVA_HEADER_LIBRARIES))) \
+    $(if $(PRIVATE_USE_SYSTEM_MODULES), \
+      --system $(PRIVATE_SYSTEM_MODULES_DIR), \
+      $(addprefix --bootclasspath ,$(strip $(PRIVATE_BOOTCLASSPATH)))) \
+    $(addprefix --classpath ,$(strip $(if $(PRIVATE_USE_SYSTEM_MODULES), \
+        $(filter-out $(PRIVATE_SYSTEM_MODULES_LIBS),$(PRIVATE_BOOTCLASSPATH))) \
+      $(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 \