Remove obsolete Brillo variable (a052599b) · Commits · e / os / android_build_soong

android/variable.go

+0 −6

Original line number	Diff line number	Diff line
		@@ -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"`

+0 −4

Original line number	Diff line number	Diff line
		@@ -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")

+0 −3

Original line number	Diff line number	Diff line
		@@ -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"
		}