diff options
| -rw-r--r-- | android/variable.go | 6 | ||||
| -rw-r--r-- | cc/compiler.go | 4 | ||||
| -rw-r--r-- | cc/makevars.go | 3 |
3 files changed, 0 insertions, 13 deletions
diff --git a/android/variable.go b/android/variable.go index 41b32bd63..db875ff37 100644 --- a/android/variable.go +++ b/android/variable.go @@ -42,11 +42,6 @@ type variableProperties struct { Enabled *bool `android:"arch_variant"` } `android:"arch_variant"` - Brillo struct { - Cflags []string - Version_script *string `android:"arch_variant"` - } `android:"arch_variant"` - Malloc_not_svelte struct { Cflags []string } @@ -156,7 +151,6 @@ type productVariables struct { Allow_missing_dependencies *bool `json:",omitempty"` Unbundled_build *bool `json:",omitempty"` - Brillo *bool `json:",omitempty"` Malloc_not_svelte *bool `json:",omitempty"` Safestack *bool `json:",omitempty"` HostStaticBinaries *bool `json:",omitempty"` diff --git a/cc/compiler.go b/cc/compiler.go index ef2228546..bbece1c90 100644 --- a/cc/compiler.go +++ b/cc/compiler.go @@ -369,10 +369,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 0386f9321..7d226d4b3 100644 --- a/cc/makevars.go +++ b/cc/makevars.go @@ -196,9 +196,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" } |