Merge "Remove debug/release cflags" into main

This commit is contained in:
Cole Faust
2024-06-14 21:15:15 +00:00
committed by Gerrit Code Review

View File

@@ -172,12 +172,6 @@ type BaseCompilerProperties struct {
Target_api *string 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 { Target struct {
Vendor, Product struct { Vendor, Product struct {
// list of source files that should only be used in vendor or // 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) 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 { if !ctx.DeviceConfig().BuildBrokenClangCFlags() && len(compiler.Properties.Clang_cflags) != 0 {
ctx.PropertyErrorf("clang_cflags", "property is deprecated, see Changes.md file") ctx.PropertyErrorf("clang_cflags", "property is deprecated, see Changes.md file")
} else { } else {