commit aa09aa819f5ff5320a7d5a7aefaadbff1b363eee
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jun 15 07:28:24 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jun 15 07:28:26 2017 +0000
tree cca3e3363d5e01f3be57037eecc68b7751584c4c
parent 5e1aa20225c6cd06d8076b6654312ff7a0de314c
parent 4f3e5685fce44c359becde39141fdaf5f8d3db34

Merge "Set JAVAC_WRAPPER if USE_GOMA is set."

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index 32fcf44..328340e 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -308,6 +308,7 @@
 
 export CC_WRAPPER
 export CXX_WRAPPER
+export JAVAC_WRAPPER
 endif
 
 ifdef TARGET_PREFER_32_BIT

core/goma.mk

diff --git a/core/goma.mk b/core/goma.mk
index 4e8318a..2fb37a7 100644
--- a/core/goma.mk
+++ b/core/goma.mk
@@ -45,6 +45,7 @@
   # use both ccache and gomacc.
   CC_WRAPPER := $(strip $(CC_WRAPPER) $(GOMA_CC))
   CXX_WRAPPER := $(strip $(CXX_WRAPPER) $(GOMA_CC))
+  JAVAC_WRAPPER := $(strip $(JAVAC_WRAPPER) $(GOMA_CC))
 
   # gomacc can start goma client's daemon process automatically, but
   # it is safer and faster to start up it beforehand. We run this as a