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

Commit e1402e4d authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Don't double-wrap with gomacc" am: b7a12806 am: 70683c3c am: 5c162198

am: e3525d90

Change-Id: I593517aa04c80401bfbdfb0bfc3de11cf2497909
parents 5982a340 e3525d90
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -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