commit 1e898b9e04d85de7274c0cad3e8752b16196c100
author Dan Willemsen <dwillemsen@google.com> Wed Sep 23 15:26:32 2015 -0700
committer Dan Willemsen <dwillemsen@google.com> Wed Sep 23 15:31:08 2015 -0700
tree d50422f77840b202b00214a24d63e727594d8367
parent e9862da7dd8d9911d26472248294069ba4f3e515

cc: Use local_include_dirs before include_dirs

Prefer local headers over remote headers

Change-Id: Ic50104c5f2cfdd96cd749d35c52cd13706ac6367

cc/cc.go

diff --git a/cc/cc.go b/cc/cc.go
index 34a1a56..a8b6051 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -461,8 +461,8 @@
 	rootIncludeDirs := pathtools.PrefixPaths(c.Properties.Include_dirs, ctx.AConfig().SrcDir())
 	localIncludeDirs := pathtools.PrefixPaths(c.Properties.Local_include_dirs, common.ModuleSrcDir(ctx))
 	flags.GlobalFlags = append(flags.GlobalFlags,
-		includeDirsToFlags(rootIncludeDirs),
-		includeDirsToFlags(localIncludeDirs))
+		includeDirsToFlags(localIncludeDirs),
+		includeDirsToFlags(rootIncludeDirs))
 
 	rootIncludeFiles := pathtools.PrefixPaths(c.Properties.Include_files, ctx.AConfig().SrcDir())
 	localIncludeFiles := pathtools.PrefixPaths(c.Properties.Local_include_files, common.ModuleSrcDir(ctx))