From 42b808b18efb789e96b2c0387b696d81b3a9ea6c Mon Sep 17 00:00:00 2001 From: Yoshisato Yanagisawa Date: Thu, 12 Oct 2017 16:04:20 +0900 Subject: [PATCH] Make SOONG_JAVAC_WRAPPER use JAVAC_WRAPPER to call javac. JAVAC_WRAPPER seems not be used when SOONG_JAVAC_WRAPPER is used. Since JAVAC_WRAPPER just wraps actual javac call, the result must be the same. Bug: 67723445 Change-Id: I944f9534587c00ffd1bc79806c534432467ba4a5 --- core/definitions.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/definitions.mk b/core/definitions.mk index cb0a6bb22e..fa6b0c1658 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -2234,7 +2234,7 @@ $(hide) rm -rf $(PRIVATE_CLASS_INTERMEDIATES_DIR) $(PRIVATE_ANNO_INTERMEDIATES_D $(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)) \