From 5591460e81b03ad816f3850806178dd3ce7f48da Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Thu, 13 Jun 2024 10:49:13 -0700 Subject: [PATCH] Remove debug/release cflags These were never fully implemented, release cflags are the same as regular cflags, and debug cflags are not used at all. Bug: 346922064 Test: Presubmits Change-Id: I0e8914e03f3a092bbc816cabf75255c55c3531e4 --- cc/compiler.go | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/cc/compiler.go b/cc/compiler.go index ede6a5d0a..7de081064 100644 --- a/cc/compiler.go +++ b/cc/compiler.go @@ -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 @@ -478,11 +472,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 {