commit 58cd98dc4777275efa2912dfaeeea8b7021b7c17
author Colin Cross <ccross@android.com> Tue Oct 17 18:37:35 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 17 18:37:35 2017 +0000
tree 4037c2f75c0fdec51566700dbf0358c134a9b65a
parent 51e7a0cca47d60d358817a19e0e07f857e1653ad
parent f960257c1445149aebbfde386e9330a0c82f2265

Merge "Use system modules generated by soong when using javac -target 1.9"

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index 0e7093e..2702fc2 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -2249,7 +2249,7 @@
 $(hide) mkdir -p $(dir $@)
 $(hide) mkdir -p $(PRIVATE_CLASS_INTERMEDIATES_DIR) $(PRIVATE_ANNO_INTERMEDIATES_DIR)
 $(hide) if [ -s $(PRIVATE_JAVA_SOURCE_LIST) ] ; then \
-    $(SOONG_JAVAC_WRAPPER) $(1) -encoding UTF-8 \
+    $(SOONG_JAVAC_WRAPPER) $(JAVAC_WRAPPER) $(1) -encoding UTF-8 \
     $(if $(findstring true,$(PRIVATE_WARNINGS_ENABLE)),$(xlint_unchecked),) \
     $(if $(PRIVATE_USE_SYSTEM_MODULES), \
       $(addprefix --system=,$(PRIVATE_SYSTEM_MODULES)), \