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

Merge "Use correct includes for mixed build gen headers" am: 012ae1f4e0 am: 349bd6a36b am: 5002f7beba 

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1660760

Change-Id: I73b863ce8cc06cccf8efffb6cd4893db8cc8cb6a
This commit is contained in:
Christopher Parsons 2021-04-05 20:53:08 +00:00 committed by Automerger Merge Worker
parent 09577faf2d 5002f7beba
commit 1d1d206874
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

@ -174,7 +174,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
} }