commit 6648ab014336217789d672a44babd7ff8edbabe2
author Treehugger Robot <treehugger-gerrit@google.com> Thu Oct 06 00:13:27 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Oct 06 00:13:27 2016 +0000
tree 211d549e0386fe1289760b5f11ab00340e0d8409
parent 315a6ffc99a67b43782bd2f627bc981bfd5ed7aa
parent de18f472508d7127ccaf7db8c2f0c756a1eeca96

Merge "Mark Soong-exported make variables as readonly"

cc/config/global.go

diff --git a/cc/config/global.go b/cc/config/global.go
index 0a7bdc5..ae43301 100644
--- a/cc/config/global.go
+++ b/cc/config/global.go
@@ -95,6 +95,7 @@
 	pctx.PrefixedPathsForOptionalSourceVariable("CommonGlobalIncludes", "-I",
 		[]string{
 			"system/core/include",
+			"frameworks/native/include",
 		})
 	pctx.PrefixedPathsForOptionalSourceVariable("CommonGlobalSystemIncludes", "-isystem ",
 		[]string{
@@ -103,7 +104,6 @@
 			"hardware/libhardware_legacy/include",
 			"hardware/ril/include",
 			"libnativehelper/include",
-			"frameworks/native/include",
 			"frameworks/native/opengl/include",
 			"frameworks/av/include",
 			"frameworks/base/include",