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

Apply export_include_dirs to assembly files

Browse Source 
am: 76f0827ce3

Change-Id: Ibe3c32493f6142e241bc5e78c3c31711cec07163
This commit is contained in:
Dan Willemsen
2016-07-11 20:18:05 +00:00
committed by android-build-merger
parent 89ae37fb8d 76f0827ce3
commit 6f4ce93924
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cc/cc.go
View File

@@ -209,8 +209,6 @@ type Deps struct {
GeneratedSources []string GeneratedSources []string
GeneratedHeaders []string GeneratedHeaders []string
Cflags, ReexportedCflags []string
CrtBegin, CrtEnd string CrtBegin, CrtEnd string
} }
@@ -224,7 +222,7 @@ type PathDeps struct {
GeneratedSources android.Paths GeneratedSources android.Paths
GeneratedHeaders android.Paths GeneratedHeaders android.Paths
Cflags, ReexportedCflags []string Flags, ReexportedFlags []string
CrtBegin, CrtEnd android.OptionalPath CrtBegin, CrtEnd android.OptionalPath
} }
@@ -737,7 +735,7 @@ func (c *Module) GenerateAndroidBuildActions(actx android.ModuleContext) {
return return
} }
flags.CFlags = append(flags.CFlags, deps.Cflags...) flags.GlobalFlags = append(flags.GlobalFlags, deps.Flags...)
var objFiles android.Paths var objFiles android.Paths
if c.compiler != nil { if c.compiler != nil {
@@ -991,7 +989,7 @@ func (c *Module) depsToPaths(ctx android.ModuleContext) PathDeps {
if genRule, ok := m.(genrule.SourceFileGenerator); ok { if genRule, ok := m.(genrule.SourceFileGenerator); ok {
depPaths.GeneratedHeaders = append(depPaths.GeneratedHeaders, depPaths.GeneratedHeaders = append(depPaths.GeneratedHeaders,
genRule.GeneratedSourceFiles()...) genRule.GeneratedSourceFiles()...)
depPaths.Cflags = append(depPaths.Cflags, depPaths.Flags = append(depPaths.Flags,
includeDirsToFlags(android.Paths{genRule.GeneratedHeaderDir()})) includeDirsToFlags(android.Paths{genRule.GeneratedHeaderDir()}))
} else { } else {
ctx.ModuleErrorf("module %q is not a genrule", name) ctx.ModuleErrorf("module %q is not a genrule", name)
@@ -1030,11 +1028,11 @@ func (c *Module) depsToPaths(ctx android.ModuleContext) PathDeps {
if t, ok := tag.(dependencyTag); ok && t.library { if t, ok := tag.(dependencyTag); ok && t.library {
if i, ok := cc.linker.(exportedFlagsProducer); ok { if i, ok := cc.linker.(exportedFlagsProducer); ok {
cflags := i.exportedFlags() flags := i.exportedFlags()
depPaths.Cflags = append(depPaths.Cflags, cflags...) depPaths.Flags = append(depPaths.Flags, flags...)
if t.reexportFlags { if t.reexportFlags {
depPaths.ReexportedCflags = append(depPaths.ReexportedCflags, cflags...) depPaths.ReexportedFlags = append(depPaths.ReexportedFlags, flags...)
} }
} }
@@ -1752,7 +1750,7 @@ func (library *libraryLinker) link(ctx ModuleContext,
} }
library.exportIncludes(ctx, "-I") library.exportIncludes(ctx, "-I")
library.reexportFlags(deps.ReexportedCflags) library.reexportFlags(deps.ReexportedFlags)
return out return out
} }