Revert "Revert "Move system/core/include from -isystem to -I""
This reverts commit 763a26cef5607c903b472e8a5a9351d25f5e12a6.
Bug: 31492149
Change-Id: I322f5e31da306951ac13131f5113730e945dedd5
diff --git a/cc/config/global.go b/cc/config/global.go
index 5b49bc3..d17a7d1 100644
--- a/cc/config/global.go
+++ b/cc/config/global.go
@@ -93,10 +93,11 @@
// Everything in these lists is a crime against abstraction and dependency tracking.
// Do not add anything to this list.
pctx.PrefixedPathsForOptionalSourceVariable("CommonGlobalIncludes", "-I",
- []string{})
- pctx.PrefixedPathsForOptionalSourceVariable("CommonGlobalSystemIncludes", "-isystem ",
[]string{
"system/core/include",
+ })
+ pctx.PrefixedPathsForOptionalSourceVariable("CommonGlobalSystemIncludes", "-isystem ",
+ []string{
"system/media/audio/include",
"hardware/libhardware/include",
"hardware/libhardware_legacy/include",