commit 28ff3e3f94d2600daf9cbccaba4db6db236f7d2b
author Colin Cross <ccross@android.com> Thu Mar 05 12:41:30 2020 -0800
committer Colin Cross <ccross@android.com> Thu Mar 05 20:46:47 2020 +0000
tree 82673c552c1c4474c192eaed1c4b6286d48367d7
parent 90d40275429df80ef2e10c472cd0e4aca9f31cd3

Disable goma for javac actions in Make

goma can't handle the --system argument that Android must pass to
javac.

Bug: b/143658984
Test: treehugger
Change-Id: I7091a14f940ae696930c9d4a7869ae3a81a33fbe

core/goma.mk

diff --git a/core/goma.mk b/core/goma.mk
index c265259..2b51d8b 100644
--- a/core/goma.mk
+++ b/core/goma.mk
@@ -27,7 +27,8 @@
   # 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))
+  # b/143658984: goma can't handle the --system argument to javac
+  #JAVAC_WRAPPER := $(strip $(JAVAC_WRAPPER) $(GOMA_CC))
 
   goma_dir :=
 endif