p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Set JAVAC_WRAPPER if USE_GOMA is set." am: aa09aa819f 

am: cc2ca23b1e

Change-Id: Ie7288bc85507008efeed8bf5a3b42ceb2392062b
This commit is contained in:
Yoshisato Yanagisawa 2017-06-15 07:38:39 +00:00 committed by android-build-merger
parent 9c57325093 cc2ca23b1e
commit 7b691489a8
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/config.mk
View File

@ -308,6 +308,7 @@ include $(BUILD_SYSTEM)/goma.mk
export CC_WRAPPER export CC_WRAPPER
export CXX_WRAPPER export CXX_WRAPPER
export JAVAC_WRAPPER
endif endif
ifdef TARGET_PREFER_32_BIT ifdef TARGET_PREFER_32_BIT

1
core/goma.mk
View File

@ -45,6 +45,7 @@ ifneq ($(filter-out false,$(USE_GOMA)),)
# use both ccache and gomacc. # use both ccache and gomacc.
CC_WRAPPER := $(strip $(CC_WRAPPER) $(GOMA_CC)) CC_WRAPPER := $(strip $(CC_WRAPPER) $(GOMA_CC))
CXX_WRAPPER := $(strip $(CXX_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 # 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 # it is safer and faster to start up it beforehand. We run this as a