diff options
| author | Jan Altensen <info@stricted.net> | 2021-08-07 19:41:59 +0200 |
|---|---|---|
| committer | Jan Altensen <info@stricted.net> | 2021-08-08 01:21:49 +0200 |
| commit | 2c546497bfd8266444bd5d40a342745310c7d2c0 (patch) | |
| tree | bb387e207461efbf630ab49db9e9ceb2c75d8b15 | |
| parent | c539857b7c945f4bc336500a2116d66f7932e06c (diff) | |
soong: move header override to compiler.go
* library.go only covers libraries
Change-Id: I3374999d6b364dd1bbc2060996964ee7b04493e7
| -rw-r--r-- | cc/compiler.go | 10 | ||||
| -rw-r--r-- | cc/library.go | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/cc/compiler.go b/cc/compiler.go index d9567e851..ab53d1da5 100644 --- a/cc/compiler.go +++ b/cc/compiler.go @@ -257,6 +257,16 @@ func (compiler *baseCompiler) compilerFlags(ctx ModuleContext, flags Flags, deps tc := ctx.toolchain() modulePath := android.PathForModuleSrc(ctx).String() + additionalIncludeDirs := ctx.DeviceConfig().TargetSpecificHeaderPath() + if len(additionalIncludeDirs) > 0 { + // devices can have multiple paths in TARGET_SPECIFIC_HEADER_PATH + // add -I in front of all of them + if (strings.Contains(additionalIncludeDirs, " ")) { + additionalIncludeDirs = strings.ReplaceAll(additionalIncludeDirs, " ", " -I") + } + flags.Local.CommonFlags = append(flags.Local.CommonFlags, "-I" + additionalIncludeDirs) + } + compiler.srcsBeforeGen = android.PathsForModuleSrcExcludes(ctx, compiler.Properties.Srcs, compiler.Properties.Exclude_srcs) compiler.srcsBeforeGen = append(compiler.srcsBeforeGen, deps.GeneratedSources...) diff --git a/cc/library.go b/cc/library.go index 4191ce9e2..ab10c6307 100644 --- a/cc/library.go +++ b/cc/library.go @@ -546,16 +546,6 @@ func (library *libraryDecorator) linkerFlags(ctx ModuleContext, flags Flags) Fla } func (library *libraryDecorator) compilerFlags(ctx ModuleContext, flags Flags, deps PathDeps) Flags { - additionalIncludeDirs := ctx.DeviceConfig().TargetSpecificHeaderPath() - if len(additionalIncludeDirs) > 0 { - // devices can have multiple paths in TARGET_SPECIFIC_HEADER_PATH - // add -I in front of all of them - if (strings.Contains(additionalIncludeDirs, " ")) { - additionalIncludeDirs = strings.ReplaceAll(additionalIncludeDirs, " ", " -I") - } - flags.Local.CommonFlags = append(flags.Local.CommonFlags, "-I" + additionalIncludeDirs) - } - exportIncludeDirs := library.flagExporter.exportedIncludes(ctx) if len(exportIncludeDirs) > 0 { f := includeDirsToFlags(exportIncludeDirs) |