aboutsummaryrefslogtreecommitdiffstats
path: root/cc
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2018-02-22 22:18:56 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2018-02-22 22:18:56 +0000
commit2f2f24f775c1670c6a901a2f5f2e47dcaeb63c0d (patch)
treeebbaa25e4a575b0ed0da09f86389a56a459428aa /cc
parent581fd21e9111138359d1685c3fea59e3466b2b58 (diff)
parent9da9d49ede01c762ac76b604dc4ab3ce24658c1c (diff)
downloadbuild_soong-2f2f24f775c1670c6a901a2f5f2e47dcaeb63c0d.tar.gz
build_soong-2f2f24f775c1670c6a901a2f5f2e47dcaeb63c0d.tar.bz2
build_soong-2f2f24f775c1670c6a901a2f5f2e47dcaeb63c0d.zip
Merge "Only depend on a single file for generated headers"
Diffstat (limited to 'cc')
-rw-r--r--cc/cc.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/cc/cc.go b/cc/cc.go
index f65441fa..05a1579b 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -1138,13 +1138,13 @@ func (c *Module) depsToPaths(ctx android.ModuleContext) PathDeps {
case genHeaderDepTag, genHeaderExportDepTag:
if genRule, ok := dep.(genrule.SourceFileGenerator); ok {
depPaths.GeneratedHeaders = append(depPaths.GeneratedHeaders,
- genRule.GeneratedSourceFiles()...)
+ genRule.GeneratedDeps()...)
flags := includeDirsToFlags(genRule.GeneratedHeaderDirs())
depPaths.Flags = append(depPaths.Flags, flags)
if depTag == genHeaderExportDepTag {
depPaths.ReexportedFlags = append(depPaths.ReexportedFlags, flags)
depPaths.ReexportedFlagsDeps = append(depPaths.ReexportedFlagsDeps,
- genRule.GeneratedSourceFiles()...)
+ genRule.GeneratedDeps()...)
// Add these re-exported flags to help header-abi-dumper to infer the abi exported by a library.
c.sabi.Properties.ReexportedIncludeFlags = append(c.sabi.Properties.ReexportedIncludeFlags, flags)