StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove [local_]include_files

Browse Source 
am: cd114c1cb7

* commit 'cd114c1cb707cb205ddf07e96bb61d97dfee5018':
  Remove [local_]include_files

Change-Id: Ia81168c60b0f1235f16742a23ffbb4b0c5bd6089
This commit is contained in:
Dan Willemsen
2016-05-26 23:27:14 +00:00
committed by android-build-merger
parent f56a2b16f8 cd114c1cb7
commit 4ae64644f1
1 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
cc/cc.go
View File

@@ -269,20 +269,10 @@ type BaseCompilerProperties struct {
// that module. // that module.
Include_dirs []string `android:"arch_variant"` 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 // list of directories relative to the Blueprints file that will
// be added to the include path using -I // be added to the include path using -I
Local_include_dirs []string `android:"arch_variant"` 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 // list of generated sources to compile. These are the names of gensrcs or
// genrule modules. // genrule modules.
Generated_sources []string `android:"arch_variant"` Generated_sources []string `android:"arch_variant"`
@@ -1037,13 +1027,6 @@ func (compiler *baseCompiler) flags(ctx ModuleContext, flags Flags) Flags {
includeDirsToFlags(localIncludeDirs), includeDirsToFlags(localIncludeDirs),
includeDirsToFlags(rootIncludeDirs)) 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.noDefaultCompilerFlags() {
if !ctx.sdk() || ctx.Host() { if !ctx.sdk() || ctx.Host() {
flags.GlobalFlags = append(flags.GlobalFlags, flags.GlobalFlags = append(flags.GlobalFlags,