From fc9c28ca02d2e59c03d387ab17eddf974d794fa8 Mon Sep 17 00:00:00 2001
From: Dan Willemsen <dwillemsen@google.com>
Date: Tue, 12 Jan 2016 16:22:40 -0800
Subject: Toolchain modules use GCC

Don't use clang cflags if the device uses clang by default.

Change-Id: Ice8474ae1f5e6f37fc8b47b1679d7fbdb9249e5a
---
 cc/cc.go | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/cc/cc.go b/cc/cc.go
index bc486225..6cff27f8 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -1882,6 +1882,7 @@ func ToolchainLibraryFactory() (blueprint.Module, []interface{}) {
 	module := &toolchainLibrary{}
 
 	module.LibraryProperties.BuildStatic = true
+	module.Properties.Clang = proptools.BoolPtr(false)
 
 	return newCCBase(&module.CCBase, module, common.DeviceSupported, common.MultilibBoth,
 		&module.LibraryProperties)
@@ -1893,6 +1894,10 @@ func (c *toolchainLibrary) compileModule(ctx common.AndroidModuleContext,
 	libName := ctx.ModuleName() + staticLibraryExtension
 	outputFile := common.PathForModuleOut(ctx, libName)
 
+	if flags.Clang {
+		ctx.ModuleErrorf("toolchain_library must use GCC, not Clang")
+	}
+
 	CopyGccLib(ctx, libName, ccFlagsToBuilderFlags(flags), outputFile)
 
 	c.out = outputFile
-- 
cgit v1.2.3