From 1e898b9e04d85de7274c0cad3e8752b16196c100 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Wed, 23 Sep 2015 15:26:32 -0700 Subject: [PATCH] cc: Use local_include_dirs before include_dirs Prefer local headers over remote headers Change-Id: Ic50104c5f2cfdd96cd749d35c52cd13706ac6367 --- cc/cc.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cc/cc.go b/cc/cc.go index 34a1a56e2..a8b605117 100644 --- a/cc/cc.go +++ b/cc/cc.go @@ -461,8 +461,8 @@ func (c *CCBase) collectFlags(ctx common.AndroidModuleContext, toolchain Toolcha 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))