Don't double-wrap with gomacc

config.mk is parsed by make and then kati, and goma.mk appends to
CC_WRAPPER.  Only export it from make so gomacc doesn't appear twice on
the command line.

Bug: 31142427
Change-Id: I5ad97ee3a00b013faa620215c839499b48528e00
This commit is contained in:
Colin Cross 2016-08-31 13:32:39 -07:00
parent 5a5befb7c0
commit 44005d41dc

View file

@ -281,11 +281,13 @@ combo_2nd_arch_prefix := $(TARGET_2ND_ARCH_VAR_PREFIX)
include $(BUILD_SYSTEM)/combo/select.mk
endif
ifndef KATI
include $(BUILD_SYSTEM)/ccache.mk
include $(BUILD_SYSTEM)/goma.mk
export CC_WRAPPER
export CXX_WRAPPER
endif
ifdef TARGET_PREFER_32_BIT
TARGET_PREFER_32_BIT_APPS := true