commit 1d1e5ef61b8923ec5ecec072267ddbb688a1f62f
author Colin Cross <ccross@android.com> Sat Sep 23 18:19:05 2017 -0700
committer Colin Cross <ccross@android.com> Mon Sep 25 16:14:42 2017 -0700
tree 6ced528bc9d1ea7446eb334b967fabe4f5fca5b3
parent f6bc1a1ac03e21770e5143fa3675795e7dce93e2

Add dependencies on bootclasspath libraries

The libraries in the bootclasspath were getting their dependencies
because they were also in the default libraries list.  Make the
dependencies explicit in preparation for rearranging the default
libraries.

Test: m -j checkbuild
Change-Id: I3ea004714a31cd648ec2ef57ed3099bce70bc6b9

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index cfc2897..1ed2ca2 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -2247,7 +2247,8 @@
 $(hide) if [ -s $(PRIVATE_JAVA_SOURCE_LIST) ] ; then \
     $(SOONG_JAVAC_WRAPPER) $(1) -encoding UTF-8 \
     $(if $(findstring true,$(PRIVATE_WARNINGS_ENABLE)),$(xlint_unchecked),) \
-    $(2) \
+    $(addprefix -bootclasspath ,$(strip \
+        $(call normalize-path-list,$(2)))) \
     $(addprefix -classpath ,$(strip \
         $(call normalize-path-list,$(3)))) \
     $(if $(findstring true,$(PRIVATE_WARNINGS_ENABLE)),$(xlint_unchecked),) \
@@ -2286,9 +2287,11 @@
 @mkdir $(dir $@)/classes-turbine
 $(hide) if [ -s $(PRIVATE_JAVA_SOURCE_LIST) ] ; then \
     $(JAVA) -jar $(TURBINE) \
-    --output $@.premerged --temp_dir $(dir $@)/classes-turbine -$(PRIVATE_BOOTCLASSPATH) \
+    --output $@.premerged --temp_dir $(dir $@)/classes-turbine \
     --sources \@$(PRIVATE_JAVA_SOURCE_LIST) \
     --javacopts $(PRIVATE_JAVACFLAGS) $(COMMON_JDK_FLAGS) \
+    $(addprefix --bootclasspath, $(strip \
+         $(call normalize-path-list,$(PRIVATE_BOOTCLASSPATH)))) \
     $(addprefix --classpath ,$(strip \
         $(call normalize-path-list,$(PRIVATE_ALL_JAVA_HEADER_LIBRARIES)))) \
     || ( rm -rf $(dir $@)/classes-turbine ; exit 41 ) && \