commit 51e7a0cca47d60d358817a19e0e07f857e1653ad
author Treehugger Robot <treehugger-gerrit@google.com> Tue Oct 17 05:08:10 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 17 05:08:10 2017 +0000
tree 1f1c76777c067c0483a71bb2952bb3960f4b62aa
parent ff806ece8da92006a640a62fb1adaaf1cc154723
parent 42b808b18efb789e96b2c0387b696d81b3a9ea6c

Merge "Make SOONG_JAVAC_WRAPPER use JAVAC_WRAPPER to call javac."

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index 1f9891e..ea348c9 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),) \
     $(addprefix -bootclasspath ,$(strip \
         $(call normalize-path-list,$(PRIVATE_BOOTCLASSPATH)) \