StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 70683c3ccf

Change-Id: I041bdcc7d533109749df3b2c07597c098ecd8821
This commit is contained in:
Colin Cross
2016-09-01 16:12:25 +00:00
committed by android-build-merger
parent 0e35de1436 70683c3ccf
commit 5c16219854
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/config.mk
View File

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