Merge "Remove debug/release cflags" into main am: 7dc42aa7af

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3131536

Change-Id: Ia36b210486ca3067d4875b2a152868d8c3e95d1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Cole Faust 2024-06-14 21:20:26 +00:00 committed by Automerger Merge Worker
commit 25c7781a5f

View file

@ -172,12 +172,6 @@ type BaseCompilerProperties struct {
Target_api *string
}
Debug, Release struct {
// list of module-specific flags that will be used for C and C++ compiles in debug or
// release builds
Cflags []string `android:"arch_variant"`
} `android:"arch_variant"`
Target struct {
Vendor, Product struct {
// list of source files that should only be used in vendor or
@ -479,11 +473,6 @@ func (compiler *baseCompiler) compilerFlags(ctx ModuleContext, flags Flags, deps
ctx.ModuleErrorf("%s", err)
}
CheckBadCompilerFlags(ctx, "release.cflags", compiler.Properties.Release.Cflags)
// TODO: debug
flags.Local.CFlags = append(flags.Local.CFlags, esc(compiler.Properties.Release.Cflags)...)
if !ctx.DeviceConfig().BuildBrokenClangCFlags() && len(compiler.Properties.Clang_cflags) != 0 {
ctx.PropertyErrorf("clang_cflags", "property is deprecated, see Changes.md file")
} else {