|
@@ -247,6 +247,8 @@ var (
|
|
|
"-Wno-error=enum-constexpr-conversion", // http://b/243964282
|
|
|
}
|
|
|
|
|
|
+ noOverride64GlobalCflags = []string{}
|
|
|
+
|
|
|
noOverrideExternalGlobalCflags = []string{
|
|
|
// http://b/148815709
|
|
|
"-Wno-sizeof-array-div",
|
|
@@ -384,12 +386,26 @@ func init() {
|
|
|
return strings.Join(deviceGlobalCflags, " ")
|
|
|
})
|
|
|
|
|
|
- // Export the static default NoOverrideGlobalCflags to Bazel.
|
|
|
+ // Export the static default NoOverrideGlobalCflags and NoOverride64GlobalCflags to Bazel.
|
|
|
exportedVars.ExportStringList("NoOverrideGlobalCflags", noOverrideGlobalCflags)
|
|
|
+ exportedVars.ExportStringList("NoOverride64GlobalCflags", noOverride64GlobalCflags)
|
|
|
pctx.VariableFunc("NoOverrideGlobalCflags", func(ctx android.PackageVarContext) string {
|
|
|
flags := noOverrideGlobalCflags
|
|
|
if ctx.Config().IsEnvTrue("LLVM_NEXT") {
|
|
|
flags = append(noOverrideGlobalCflags, llvmNextExtraCommonGlobalCflags...)
|
|
|
+ if ctx.Config().Android64() {
|
|
|
+ flags = append(noOverride64GlobalCflags)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return strings.Join(flags, " ")
|
|
|
+ })
|
|
|
+
|
|
|
+ // Export the static default NoOverride64GlobalCflags to Bazel.
|
|
|
+ exportedVars.ExportStringList("NoOverride64GlobalCflags", noOverride64GlobalCflags)
|
|
|
+ pctx.VariableFunc("NoOverride64GlobalCflags", func(ctx android.PackageVarContext) string {
|
|
|
+ flags := noOverride64GlobalCflags
|
|
|
+ if ctx.Config().IsEnvTrue("LLVM_NEXT") && ctx.Config().Android64() {
|
|
|
+ flags = append(noOverride64GlobalCflags, llvmNextExtraCommonGlobalCflags...)
|
|
|
}
|
|
|
return strings.Join(flags, " ")
|
|
|
})
|