Remove -isystem frameworks/av/include

Remove the last -isystem for global include directory (besides
bionic).

Bug: 31751828
Test: builds
Change-Id: I8f38332de8f0cffd5c56b9b5ebeacbaaf3a4faea
Merged-In: I8f38332de8f0cffd5c56b9b5ebeacbaaf3a4faea
(cherry picked from commit d13a457a45)
This commit is contained in:
Colin Cross 2017-04-30 17:45:07 -07:00
parent 7c34c4c8eb
commit 307d145ed5
3 changed files with 1 additions and 5 deletions

View file

@ -219,7 +219,6 @@ func (compiler *baseCompiler) compilerFlags(ctx ModuleContext, flags Flags) Flag
if !(ctx.sdk() || ctx.vndk()) || ctx.Host() {
flags.SystemIncludeFlags = append(flags.SystemIncludeFlags,
"${config.CommonGlobalIncludes}",
"${config.CommonGlobalSystemIncludes}",
tc.IncludeFlags(),
"${config.CommonNativehelperInclude}")
}

View file

@ -112,9 +112,6 @@ func init() {
"libnativehelper/include",
"frameworks/native/include",
"frameworks/native/opengl/include",
})
pctx.PrefixedPathsForOptionalSourceVariable("CommonGlobalSystemIncludes", "-isystem ",
[]string{
"frameworks/av/include",
})
// This is used by non-NDK modules to get jni.h. export_include_dirs doesn't help

View file

@ -77,7 +77,7 @@ func makeVarsProvider(ctx android.MakeVarsContext) {
ctx.Strict("AIDL_CPP", "${aidlCmd}")
includeFlags, err := ctx.Eval("${config.CommonGlobalIncludes} ${config.CommonGlobalSystemIncludes}")
includeFlags, err := ctx.Eval("${config.CommonGlobalIncludes}")
if err != nil {
panic(err)
}