openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

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

am: 7b691489a8

Change-Id: I1aad4f8b17853308346d62cf70a54d6503ba9675
This commit is contained in:
Yoshisato Yanagisawa 2017-06-15 07:42:11 +00:00 committed by android-build-merger
parent ca811c825c 7b691489a8
commit 1cceaef3fc
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