commit 06f453359a6686e20d00e7ab661e39ce0e0e5bb5
author Dan Willemsen <dwillemsen@google.com> Mon May 16 19:32:33 2016 -0700
committer Dan Willemsen <dwillemsen@google.com> Mon May 16 19:32:33 2016 -0700
tree 0ce69db78f6ea984a86f8d82a79df532e746d745
parent b436fdee65b2ae27576b37f1f13a324bc9c7f51a

Export -D__BRILLO__ to make if necessary

Fixes Brillo builds

Change-Id: Ia3563b0c9e000d95ed18d05460f5c8c32e04e191

cc/makevars.go

diff --git a/cc/makevars.go b/cc/makevars.go
index ebb19f1..97a26de 100644
--- a/cc/makevars.go
+++ b/cc/makevars.go
@@ -74,6 +74,10 @@
 
 	globalCflags := fmt.Sprintf("${commonGlobalCflags} ${%sGlobalCflags}", hod)
 
+	if hod.Device() && Bool(ctx.Config().ProductVariables.Brillo) {
+		globalCflags += " -D__BRILLO__"
+	}
+
 	ctx.StrictSorted(makePrefix+"GLOBAL_CFLAGS", strings.Join([]string{
 		toolchain.ToolchainCflags(),
 		globalCflags,
@@ -93,6 +97,10 @@
 
 		globalClangCflags := fmt.Sprintf("${commonClangGlobalCflags} ${clangExtraCflags} ${%sClangGlobalCflags}", hod)
 
+		if hod.Device() && Bool(ctx.Config().ProductVariables.Brillo) {
+			globalClangCflags += " -D__BRILLO__"
+		}
+
 		ctx.StrictSorted(clangPrefix+"GLOBAL_CFLAGS", strings.Join([]string{
 			toolchain.ToolchainClangCflags(),
 			globalClangCflags,