commit 1ac080e9e578a5f61bd522dd9197339bd7a844d3
author Treehugger Robot <treehugger-gerrit@google.com> Thu Sep 27 23:27:45 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Sep 27 23:27:45 2018 +0000
tree 0b0b86da8ce007bde8f41a8b2aaeda27486ee9b7
parent 2f12a5659315e3866aca0504172c0d1dfecee7c4
parent ec17af3364525001703701a6186de75e5c9bb2be

Merge "Pass classpath to d8"

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index 995c95f..ded969b 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -2286,6 +2286,7 @@
 $(hide) $(ZIP2ZIP) -j -i $< -o $(dir $@)d8_input.jar "**/*.class"
 $(hide) $(DX_COMMAND) \
     --output $(dir $@) \
+    $(addprefix --lib ,$(PRIVATE_D8_LIBS)) \
     --min-api $(PRIVATE_MIN_SDK_VERSION) \
     $(subst --main-dex-list=, --main-dex-list , \
         $(filter-out --core-library --multi-dex --minimal-main-dex,$(PRIVATE_DX_FLAGS))) \

core/java.mk

diff --git a/core/java.mk b/core/java.mk
index cf9bf56..6ca2904 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -494,6 +494,8 @@
   $(built_dex_intermediate) : $(full_classes_pre_proguard_jar) $(extra_input_jar) $(my_proguard_sdk_raise) $(common_proguard_flag_files) $(proguard_flag_files) $(legacy_proguard_lib_deps) $(R8_COMPAT_PROGUARD)
 	$(transform-jar-to-dex-r8)
 else # !LOCAL_PROGUARD_ENABLED
+  $(built_dex_intermediate): PRIVATE_D8_LIBS := $(full_java_bootclasspath_libs) $(full_shared_java_header_libs)
+  $(built_dex_intermediate): $(full_java_bootclasspath_libs) $(full_shared_java_header_libs)
   $(built_dex_intermediate): $(full_classes_pre_proguard_jar) $(DX) $(ZIP2ZIP)
 	$(transform-classes.jar-to-dex)
 endif