Merge "Don't double-wrap with gomacc" am: b7a12806b1 am: 70683c3ccf

am: 5c16219854

Change-Id: I5c90cd78c4644a93d95158063577964f55da02ec
This commit is contained in:
Colin Cross 2016-09-01 16:15:37 +00:00 committed by android-build-merger
commit e3525d90d1

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