From 1879c68261d05865a4141179298a5d4b740519ff Mon Sep 17 00:00:00 2001 From: Alix Date: Tue, 26 Apr 2022 19:17:51 +0000 Subject: [PATCH] deletion of clang_cflags & clang_asflags from Soong Clang_cflags and clang_asflags are depecrated. Set up BUILD_BROKEN flags so partners can bypass errors from using them Bug: 226636335 Test: m nothing & treehugger Change-Id: Ic1d90b72decc4c6c1f7e6dda95a2c56ab2c26d86 --- android/config.go | 8 ++++ android/variable.go | 2 + cc/cc_test.go | 90 +++++++++++++++++++++++++++++++++++++++++++++ cc/compiler.go | 20 ++++++++-- 4 files changed, 116 insertions(+), 4 deletions(-) diff --git a/android/config.go b/android/config.go index 745410f1e..ee432a21f 100644 --- a/android/config.go +++ b/android/config.go @@ -1619,6 +1619,14 @@ func (c *deviceConfig) ShippingApiLevel() ApiLevel { return uncheckedFinalApiLevel(apiLevel) } +func (c *deviceConfig) BuildBrokenClangAsFlags() bool { + return c.config.productVariables.BuildBrokenClangAsFlags +} + +func (c *deviceConfig) BuildBrokenClangCFlags() bool { + return c.config.productVariables.BuildBrokenClangCFlags +} + func (c *deviceConfig) BuildBrokenClangProperty() bool { return c.config.productVariables.BuildBrokenClangProperty } diff --git a/android/variable.go b/android/variable.go index 7a080fef7..aeadb9163 100644 --- a/android/variable.go +++ b/android/variable.go @@ -430,6 +430,8 @@ type productVariables struct { ShippingApiLevel *string `json:",omitempty"` + BuildBrokenClangAsFlags bool `json:",omitempty"` + BuildBrokenClangCFlags bool `json:",omitempty"` BuildBrokenClangProperty bool `json:",omitempty"` BuildBrokenDepfile *bool `json:",omitempty"` BuildBrokenEnforceSyspropOwner bool `json:",omitempty"` diff --git a/cc/cc_test.go b/cc/cc_test.go index 5d569cc9e..01ac13320 100644 --- a/cc/cc_test.go +++ b/cc/cc_test.go @@ -4386,3 +4386,93 @@ func TestCcBuildBrokenClangProperty(t *testing.T) { }) } } + +func TestCcBuildBrokenClangAsFlags(t *testing.T) { + tests := []struct { + name string + clangAsFlags []string + BuildBrokenClangAsFlags bool + err string + }{ + { + name: "error when clang_asflags is set", + clangAsFlags: []string{"-a", "-b"}, + err: "clang_asflags: property is deprecated", + }, + { + name: "no error when BuildBrokenClangAsFlags is explicitly set to true", + clangAsFlags: []string{"-a", "-b"}, + BuildBrokenClangAsFlags: true, + }, + } + + for _, test := range tests { + t.Run(test.name, func(t *testing.T) { + bp := fmt.Sprintf(` + cc_library { + name: "foo", + clang_asflags: %s, + }`, `["`+strings.Join(test.clangAsFlags, `","`)+`"]`) + + if test.err == "" { + android.GroupFixturePreparers( + prepareForCcTest, + android.FixtureModifyProductVariables(func(variables android.FixtureProductVariables) { + if test.BuildBrokenClangAsFlags { + variables.BuildBrokenClangAsFlags = test.BuildBrokenClangAsFlags + } + }), + ).RunTestWithBp(t, bp) + } else { + prepareForCcTest. + ExtendWithErrorHandler(android.FixtureExpectsOneErrorPattern(test.err)). + RunTestWithBp(t, bp) + } + }) + } +} + +func TestCcBuildBrokenClangCFlags(t *testing.T) { + tests := []struct { + name string + clangCFlags []string + BuildBrokenClangCFlags bool + err string + }{ + { + name: "error when clang_cflags is set", + clangCFlags: []string{"-a", "-b"}, + err: "clang_cflags: property is deprecated", + }, + { + name: "no error when BuildBrokenClangCFlags is explicitly set to true", + clangCFlags: []string{"-a", "-b"}, + BuildBrokenClangCFlags: true, + }, + } + + for _, test := range tests { + t.Run(test.name, func(t *testing.T) { + bp := fmt.Sprintf(` + cc_library { + name: "foo", + clang_cflags: %s, + }`, `["`+strings.Join(test.clangCFlags, `","`)+`"]`) + + if test.err == "" { + android.GroupFixturePreparers( + prepareForCcTest, + android.FixtureModifyProductVariables(func(variables android.FixtureProductVariables) { + if test.BuildBrokenClangCFlags { + variables.BuildBrokenClangCFlags = test.BuildBrokenClangCFlags + } + }), + ).RunTestWithBp(t, bp) + } else { + prepareForCcTest. + ExtendWithErrorHandler(android.FixtureExpectsOneErrorPattern(test.err)). + RunTestWithBp(t, bp) + } + }) + } +} diff --git a/cc/compiler.go b/cc/compiler.go index f9f7b6fd7..a75175482 100644 --- a/cc/compiler.go +++ b/cc/compiler.go @@ -441,12 +441,24 @@ func (compiler *baseCompiler) compilerFlags(ctx ModuleContext, flags Flags, deps // TODO: debug flags.Local.CFlags = append(flags.Local.CFlags, esc(compiler.Properties.Release.Cflags)...) - CheckBadCompilerFlags(ctx, "clang_cflags", compiler.Properties.Clang_cflags) - CheckBadCompilerFlags(ctx, "clang_asflags", compiler.Properties.Clang_asflags) + if !ctx.DeviceConfig().BuildBrokenClangCFlags() && len(compiler.Properties.Clang_cflags) != 0 { + ctx.PropertyErrorf("clang_cflags", "property is deprecated, see Changes.md file") + } else { + CheckBadCompilerFlags(ctx, "clang_cflags", compiler.Properties.Clang_cflags) + } + if !ctx.DeviceConfig().BuildBrokenClangAsFlags() && len(compiler.Properties.Clang_asflags) != 0 { + ctx.PropertyErrorf("clang_asflags", "property is deprecated, see Changes.md file") + } else { + CheckBadCompilerFlags(ctx, "clang_asflags", compiler.Properties.Clang_asflags) + } flags.Local.CFlags = config.ClangFilterUnknownCflags(flags.Local.CFlags) - flags.Local.CFlags = append(flags.Local.CFlags, esc(compiler.Properties.Clang_cflags)...) - flags.Local.AsFlags = append(flags.Local.AsFlags, esc(compiler.Properties.Clang_asflags)...) + if !ctx.DeviceConfig().BuildBrokenClangCFlags() { + flags.Local.CFlags = append(flags.Local.CFlags, esc(compiler.Properties.Clang_cflags)...) + } + if !ctx.DeviceConfig().BuildBrokenClangAsFlags() { + flags.Local.AsFlags = append(flags.Local.AsFlags, esc(compiler.Properties.Clang_asflags)...) + } flags.Local.CppFlags = config.ClangFilterUnknownCflags(flags.Local.CppFlags) flags.Local.ConlyFlags = config.ClangFilterUnknownCflags(flags.Local.ConlyFlags) flags.Local.LdFlags = config.ClangFilterUnknownCflags(flags.Local.LdFlags)