Revert "deletion of clang_cflags & clang_asflags from Soong"
Revert submission 2154033-delete clang_cflags clang_asflags
Reason for revert: Broke build on git_tm-dev-plus-aosp and downstream branches
Reverted Changes:
I5c499a37e:Default BuildBrokenClangCFlags & BuildBrokenClang...
Ic1d90b72d:deletion of clang_cflags & clang_asflags from Soon...
Change-Id: Ic55dd85a824cf1a543249e0b00072b8c08a475b8
diff --git a/cc/compiler.go b/cc/compiler.go
index a751754..f9f7b6f 100644
--- a/cc/compiler.go
+++ b/cc/compiler.go
@@ -441,24 +441,12 @@
// 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 {
- 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)
- }
+ CheckBadCompilerFlags(ctx, "clang_cflags", compiler.Properties.Clang_cflags)
+ CheckBadCompilerFlags(ctx, "clang_asflags", compiler.Properties.Clang_asflags)
flags.Local.CFlags = config.ClangFilterUnknownCflags(flags.Local.CFlags)
- 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.CFlags = append(flags.Local.CFlags, esc(compiler.Properties.Clang_cflags)...)
+ 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)