From 0c1f7bd956d347db4af4f2d84e0f2f6af20d20af Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Sat, 10 Mar 2018 15:29:03 -0800 Subject: [PATCH] Remove obsolete Brillo variable Unlike the original change on master, this does not remove product_variables.brillo, as I'm not backporting all of the other removal CLs. Bug: 76168832 Test: none Change-Id: I6a5ce57b317f0cdae1abef15def01e6a31e18d3e Merged-In: I6a5ce57b317f0cdae1abef15def01e6a31e18d3e (cherry picked from commit a052599bb6d00d73efb23a8ef55d145b6cf95a2c) --- cc/compiler.go | 4 ---- cc/makevars.go | 3 --- 2 files changed, 7 deletions(-) diff --git a/cc/compiler.go b/cc/compiler.go index 6154758fe..1b0eb4e3d 100644 --- a/cc/compiler.go +++ b/cc/compiler.go @@ -377,10 +377,6 @@ func (compiler *baseCompiler) compilerFlags(ctx ModuleContext, flags Flags, deps fmt.Sprintf("${config.%sGlobalCflags}", hod)) } - if Bool(ctx.Config().ProductVariables.Brillo) { - flags.GlobalFlags = append(flags.GlobalFlags, "-D__BRILLO__") - } - if ctx.Device() { if Bool(compiler.Properties.Rtti) { flags.CppFlags = append(flags.CppFlags, "-frtti") diff --git a/cc/makevars.go b/cc/makevars.go index 479e01905..b87494e6c 100644 --- a/cc/makevars.go +++ b/cc/makevars.go @@ -211,9 +211,6 @@ func makeVarsToolchain(ctx android.MakeVarsContext, secondPrefix string, hod = "Device" } - if target.Os.Class == android.Device && Bool(ctx.Config().ProductVariables.Brillo) { - productExtraCflags += "-D__BRILLO__" - } if target.Os.Class == android.Host && Bool(ctx.Config().ProductVariables.HostStaticBinaries) { productExtraLdflags += "-static" }