From cd114c1cb707cb205ddf07e96bb61d97dfee5018 Mon Sep 17 00:00:00 2001 From: Dan Willemsen Date: Wed, 25 May 2016 15:25:16 -0700 Subject: [PATCH] Remove [local_]include_files We don't actually need to do any changes to the path for the include files, so we can just rely on the include_dir search to work. It would still be useful to verify that the path isn't something bad, like an absolute path, but we'll handle that by looking at the cflags in another change. Change-Id: I0bd609435969191c4ff91f2cd06eccfb75f5097c --- cc/cc.go | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/cc/cc.go b/cc/cc.go index a828d1072..9cdd66c0e 100644 --- a/cc/cc.go +++ b/cc/cc.go @@ -269,20 +269,10 @@ type BaseCompilerProperties struct { // that module. Include_dirs []string `android:"arch_variant"` - // list of files relative to the root of the source tree that will be included - // using -include. - // If possible, don't use this. - Include_files []string `android:"arch_variant"` - // list of directories relative to the Blueprints file that will // be added to the include path using -I Local_include_dirs []string `android:"arch_variant"` - // list of files relative to the Blueprints file that will be included - // using -include. - // If possible, don't use this. - Local_include_files []string `android:"arch_variant"` - // list of generated sources to compile. These are the names of gensrcs or // genrule modules. Generated_sources []string `android:"arch_variant"` @@ -1037,13 +1027,6 @@ func (compiler *baseCompiler) flags(ctx ModuleContext, flags Flags) Flags { includeDirsToFlags(localIncludeDirs), includeDirsToFlags(rootIncludeDirs)) - rootIncludeFiles := android.PathsForSource(ctx, compiler.Properties.Include_files) - localIncludeFiles := android.PathsForModuleSrc(ctx, compiler.Properties.Local_include_files) - - flags.GlobalFlags = append(flags.GlobalFlags, - includeFilesToFlags(rootIncludeFiles), - includeFilesToFlags(localIncludeFiles)) - if !ctx.noDefaultCompilerFlags() { if !ctx.sdk() || ctx.Host() { flags.GlobalFlags = append(flags.GlobalFlags,