Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc2ca23b authored by Yoshisato Yanagisawa's avatar Yoshisato Yanagisawa Committed by android-build-merger
Browse files

Merge "Set JAVAC_WRAPPER if USE_GOMA is set." 

am: aa09aa81

Change-Id: I01f0900fff9e4fb0b1acc09e605a9a0814189a93
parents db52463b aa09aa81

core/config.mk

+1 −0
Original line number Diff line number Diff line
@@ -308,6 +308,7 @@ include $(BUILD_SYSTEM)/goma.mk 


export CC_WRAPPER

export CXX_WRAPPER

export JAVAC_WRAPPER

endif



ifdef TARGET_PREFER_32_BIT

core/goma.mk

+1 −0
Original line number Diff line number Diff line
@@ -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