openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "Add external projects only CFlags option" 

This reverts commit 6a350878d8.

Reason for revert: Breakage of many AOSP targets

Change-Id: I917e6daa04ac02ecb98c7bb1816f9bdaf46429f5
This commit is contained in:
Kevin Rocard 2018-06-05 21:43:46 +00:00
parent 328ec9e7ee
commit 0a5fee786f
3 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cc/compiler.go
View File

@ -392,12 +392,6 @@ func (compiler *baseCompiler) compilerFlags(ctx ModuleContext, flags Flags, deps
fmt.Sprintf("${config.%sGlobalCflags}", hod)) fmt.Sprintf("${config.%sGlobalCflags}", hod))
} }
if flags.Clang {
if strings.HasPrefix(android.PathForModuleSrc(ctx).String(), "external/") {
flags.GlobalFlags = append([]string{"${config.ClangExternalCflags}"}, flags.GlobalFlags...)
}
}
if ctx.Device() { if ctx.Device() {
if Bool(compiler.Properties.Rtti) { if Bool(compiler.Properties.Rtti) {
flags.CppFlags = append(flags.CppFlags, "-frtti") flags.CppFlags = append(flags.CppFlags, "-frtti")

11
cc/config/clang.go
View File

@ -173,17 +173,14 @@ func init() {
// this new warning are fixed. // this new warning are fixed.
"-Wno-null-pointer-arithmetic", "-Wno-null-pointer-arithmetic",
// Disable c++98-specific warning since Android is not concerned with C++98
// compatibility.
"-Wno-c++98-compat-extra-semi",
}, " "))
// Extra cflags for projects under external/ directory
pctx.StaticVariable("ClangExtraExternalCflags", strings.Join([]string{
// http://b/72330874 Disable -Wenum-compare until the instances detected by this new // http://b/72330874 Disable -Wenum-compare until the instances detected by this new
// warning are fixed. // warning are fixed.
"-Wno-enum-compare", "-Wno-enum-compare",
"-Wno-enum-compare-switch", "-Wno-enum-compare-switch",
// Disable c++98-specific warning since Android is not concerned with C++98
// compatibility.
"-Wno-c++98-compat-extra-semi",
}, " ")) }, " "))
} }

2
cc/config/global.go
View File

@ -170,8 +170,6 @@ func init() {
pctx.StaticVariable("CommonClangGlobalCppflags", pctx.StaticVariable("CommonClangGlobalCppflags",
strings.Join(append(ClangFilterUnknownCflags(commonGlobalCppflags), "${ClangExtraCppflags}"), " ")) strings.Join(append(ClangFilterUnknownCflags(commonGlobalCppflags), "${ClangExtraCppflags}"), " "))
pctx.StaticVariable("ClangExternalCflags", "${ClangExtraExternalCflags}")
// Everything in these lists is a crime against abstraction and dependency tracking. // Everything in these lists is a crime against abstraction and dependency tracking.
// Do not add anything to this list. // Do not add anything to this list.
pctx.PrefixedExistentPathsForSourcesVariable("CommonGlobalIncludes", "-I", pctx.PrefixedExistentPathsForSourcesVariable("CommonGlobalIncludes", "-I",