Merge "Don't double-wrap with gomacc"

am: b7a12806b1

Change-Id: If5e9b3a9dabfd3db9b16fe37e5ed0ffad956cfbb
This commit is contained in:
Colin Cross 2016-09-01 16:09:29 +00:00 committed by android-build-merger
commit 70683c3ccf
1 changed files with 2 additions and 0 deletions

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