Merge "Revert "Move system/core/include from -isystem to -I"" am: d85c0740e1

am: cd2f6df8ab

Change-Id: I856effae99a72cd57ef5e92085a28e2931136dfd
This commit is contained in:
Colin Cross
2016-09-23 16:00:50 +00:00
committed by android-build-merger

View File

@@ -93,11 +93,10 @@ func init() {
// 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.PrefixedPathsForOptionalSourceVariable("CommonGlobalIncludes", "-I", pctx.PrefixedPathsForOptionalSourceVariable("CommonGlobalIncludes", "-I",
[]string{ []string{})
"system/core/include",
})
pctx.PrefixedPathsForOptionalSourceVariable("CommonGlobalSystemIncludes", "-isystem ", pctx.PrefixedPathsForOptionalSourceVariable("CommonGlobalSystemIncludes", "-isystem ",
[]string{ []string{
"system/core/include",
"system/media/audio/include", "system/media/audio/include",
"hardware/libhardware/include", "hardware/libhardware/include",
"hardware/libhardware_legacy/include", "hardware/libhardware_legacy/include",