diff options
| author | Colin Cross <ccross@android.com> | 2017-11-16 14:33:08 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2017-11-17 11:22:08 -0800 |
| commit | f18e11074dc8bd5bd04554b5b088b1d8cc40bc35 (patch) | |
| tree | 33e7afddedb5a798ab2e1a8788c55d63d942377a /cc/library.go | |
| parent | ad59e75a567f0638bae504543664a57582326a58 (diff) | |
| download | build_soong-f18e11074dc8bd5bd04554b5b088b1d8cc40bc35.tar.gz build_soong-f18e11074dc8bd5bd04554b5b088b1d8cc40bc35.tar.bz2 build_soong-f18e11074dc8bd5bd04554b5b088b1d8cc40bc35.zip | |
Fix using aidl files from filegroups
Compute sources including from filegroup and genrule dependencies
before determining if any sources will cause flags to be added.
Test: gen_test.go
Change-Id: I0434b003bbda07a58bb2ce1a0a72997918c8fae2
Diffstat (limited to 'cc/library.go')
| -rw-r--r-- | cc/library.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cc/library.go b/cc/library.go index 23e4f44c..192496ad 100644 --- a/cc/library.go +++ b/cc/library.go @@ -317,7 +317,7 @@ func (library *libraryDecorator) linkerFlags(ctx ModuleContext, flags Flags) Fla return flags } -func (library *libraryDecorator) compilerFlags(ctx ModuleContext, flags Flags) Flags { +func (library *libraryDecorator) compilerFlags(ctx ModuleContext, flags Flags, deps PathDeps) Flags { exportIncludeDirs := library.flagExporter.exportedIncludes(ctx) if len(exportIncludeDirs) > 0 { f := includeDirsToFlags(exportIncludeDirs) @@ -325,7 +325,7 @@ func (library *libraryDecorator) compilerFlags(ctx ModuleContext, flags Flags) F flags.YasmFlags = append(flags.YasmFlags, f) } - return library.baseCompiler.compilerFlags(ctx, flags) + return library.baseCompiler.compilerFlags(ctx, flags, deps) } func extractExportIncludesFromFlags(flags []string) []string { |