Remove obsolete Brillo variable
Test: none
Change-Id: I6a5ce57b317f0cdae1abef15def01e6a31e18d3e
diff --git a/android/variable.go b/android/variable.go
index 41b32bd..db875ff 100644
--- a/android/variable.go
+++ b/android/variable.go
@@ -42,11 +42,6 @@
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 @@
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 ef22285..bbece1c 100644
--- a/cc/compiler.go
+++ b/cc/compiler.go
@@ -369,10 +369,6 @@
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 0386f93..7d226d4 100644
--- a/cc/makevars.go
+++ b/cc/makevars.go
@@ -196,9 +196,6 @@
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"
}