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

am: b795aacfef

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

View File

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