diff --git a/core/config.mk b/core/config.mk
index 5ff582a13..589512802 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -308,6 +308,7 @@ include $(BUILD_SYSTEM)/goma.mk
 
 export CC_WRAPPER
 export CXX_WRAPPER
+export JAVAC_WRAPPER
 endif
 
 ifdef TARGET_PREFER_32_BIT
diff --git a/core/goma.mk b/core/goma.mk
index 4e8318a7f..2fb37a752 100644
--- a/core/goma.mk
+++ b/core/goma.mk
@@ -45,6 +45,7 @@ ifneq ($(filter-out false,$(USE_GOMA)),)
   # 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