From 44005d41dcdff81e40229656bc88e5d65cdc20b4 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Wed, 31 Aug 2016 13:32:39 -0700
Subject: [PATCH] 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
---
 core/config.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/config.mk b/core/config.mk
index a2d5e3f3c..c04e66083 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -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