From 81b4ca681760b30ba669228c18ab09b43fa4aa38 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Fri, 23 Sep 2016 19:20:54 +0000
Subject: [PATCH] Revert "Revert "Move system/core/include from -isystem to
 -I""

This reverts commit 763a26cef5607c903b472e8a5a9351d25f5e12a6.

Bug: 31492149
Change-Id: I322f5e31da306951ac13131f5113730e945dedd5
---
 cc/config/global.go | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/cc/config/global.go b/cc/config/global.go
index 5b49bc3e9..d17a7d154 100644
--- a/cc/config/global.go
+++ b/cc/config/global.go
@@ -93,10 +93,11 @@ func init() {
 	// 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",