From 2ee4c1abbfe278d21d1ae75b39d229fa5f8834e6 Mon Sep 17 00:00:00 2001
From: Chih-Hung Hsieh <chh@google.com>
Date: Thu, 4 Aug 2016 15:35:51 -0700
Subject: [PATCH] Make it an error when LOCAL_CLANG is false.

Only projects in LOCAL_CLANG_EXCEPTION_PROJECTS can set LOCAL_CLANG to false.
Add external/gentoo/integration to this white list.

Bug: 30575506
Change-Id: Icd508686bc2eb8b9d400200166df80115af20da1
Test: build and find new warning in build.log
---
 core/binary.mk       | 2 +-
 core/clang/config.mk | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/binary.mk b/core/binary.mk
index 91816994c..e225edba8 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -278,7 +278,7 @@ endif
 # in the exception project list.
 ifeq ($(my_clang),false)
     ifeq ($(call find_in_local_clang_exception_projects,$(LOCAL_MODULE_MAKEFILE)),)
-        $(warning $(LOCAL_MODULE_MAKEFILE): $(LOCAL_MODULE): warning: LOCAL_CLANG is set to false)
+        $(error $(LOCAL_MODULE_MAKEFILE): $(LOCAL_MODULE): LOCAL_CLANG is set to false)
     endif
 endif
 
diff --git a/core/clang/config.mk b/core/clang/config.mk
index b31e419ff..7113892fb 100644
--- a/core/clang/config.mk
+++ b/core/clang/config.mk
@@ -149,6 +149,7 @@ LOCAL_CLANG_EXCEPTION_PROJECTS = \
   bionic/tests/ \
   device/huawei/angler/ \
   device/lge/bullhead/ \
+  external/gentoo/integration/ \
   external/valgrind/ \
   hardware/qcom/ \
   $(INTERNAL_LOCAL_CLANG_EXCEPTION_PROJECTS)
-- 
2.11.0