openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use correct includes for mixed build gen headers 

Previously, genrules which were used as generated_headers only
propagated the old Soong gen directory as an include path, even if the
genrule was managed by Bazel. With this chance, the gen directory of the
Baze output files are used in mixed-build mode.

Test: USE_BAZEL_ANALYSIS=1 m libc
Test: m libc
Change-Id: I3913c4e5b0354421ba1fe43d1f6ef4d1e729a058
This commit is contained in:
Chris Parsons 2021-03-31 13:32:41 -04:00
parent 100d5d6732
commit e59af4e1c0
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
android/bazel.go
View File

@ -169,7 +169,6 @@ var (
"liblinker_debuggerd_stub", // ruperts@, cc_library_static, depends on //system/libbase "liblinker_debuggerd_stub", // ruperts@, cc_library_static, depends on //system/libbase
"libbionic_tests_headers_posix", // ruperts@, cc_library_static "libbionic_tests_headers_posix", // ruperts@, cc_library_static
"libc_dns", // ruperts@, cc_library_static "libc_dns", // ruperts@, cc_library_static
"generated_android_ids", // cparsons@, genrule
"note_memtag_heap_async", // cparsons@, cc_library_static "note_memtag_heap_async", // cparsons@, cc_library_static
"note_memtag_heap_sync", // cparsons@, cc_library_static "note_memtag_heap_sync", // cparsons@, cc_library_static
} }

5
genrule/genrule.go
View File

@ -229,11 +229,16 @@ func (c *Module) generateBazelBuildActions(ctx android.ModuleContext, label stri
filePaths, ok := bazelCtx.GetOutputFiles(label, ctx.Arch().ArchType) filePaths, ok := bazelCtx.GetOutputFiles(label, ctx.Arch().ArchType)
if ok { if ok {
var bazelOutputFiles android.Paths var bazelOutputFiles android.Paths
exportIncludeDirs := map[string]bool{}
for _, bazelOutputFile := range filePaths { for _, bazelOutputFile := range filePaths {
bazelOutputFiles = append(bazelOutputFiles, android.PathForBazelOut(ctx, bazelOutputFile)) bazelOutputFiles = append(bazelOutputFiles, android.PathForBazelOut(ctx, bazelOutputFile))
exportIncludeDirs[filepath.Dir(bazelOutputFile)] = true
} }
c.outputFiles = bazelOutputFiles c.outputFiles = bazelOutputFiles
c.outputDeps = bazelOutputFiles c.outputDeps = bazelOutputFiles
for includePath, _ := range exportIncludeDirs {
c.exportedIncludeDirs = append(c.exportedIncludeDirs, android.PathForBazelOut(ctx, includePath))
}
} }
return ok return ok
} }