From d78cba12fe17c2c4406bb7e12c4110518c5c6859 Mon Sep 17 00:00:00 2001
From: Shinichiro Hamaji <hamaji@google.com>
Date: Fri, 18 Dec 2015 15:26:17 +0900
Subject: [PATCH] Disable goma/ccache with USE_XXX=false

Bug: 26009364
Change-Id: Ic0001e6fdc62ca2373309bfe3127c5fec64d2d85
---
 core/ccache.mk | 2 +-
 core/goma.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/ccache.mk b/core/ccache.mk
index c99d933e68..5c2ae23da6 100644
--- a/core/ccache.mk
+++ b/core/ccache.mk
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-ifneq ($(USE_CCACHE),)
+ifneq ($(filter-out false,$(USE_CCACHE)),)
   # The default check uses size and modification time, causing false misses
   # since the mtime depends when the repo was checked out
   export CCACHE_COMPILERCHECK := content
diff --git a/core/goma.mk b/core/goma.mk
index 01a1d815d9..6535b3e4a8 100644
--- a/core/goma.mk
+++ b/core/goma.mk
@@ -15,7 +15,7 @@
 #
 
 # Notice: this works only with Google's Goma build infrastructure.
-ifneq ($(USE_GOMA),)
+ifneq ($(filter-out false,$(USE_GOMA)),)
   # Check if USE_NINJA is not false because GNU make won't work well
   # with goma. Note this file is evaluated twice, once by GNU make and
   # once by kati with USE_NINJA=false. We do this check in the former