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 "bp2build: cc_library_headers converter should only include that module type" am: b1672af5d2 am: 5d622ec767 am: b1ab70742c 

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

Change-Id: I269f513856d3b1a4bd1d83ea1fce7a550220a507
This commit is contained in:
Jingwen Chen 2021-03-19 11:31:25 +00:00 committed by Automerger Merge Worker
parent f0a758c0fe b1ab70742c
commit eafb095afe
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cc/library_headers.go
View File

@ -90,16 +90,12 @@ func CcLibraryHeadersBp2Build(ctx android.TopDownMutatorContext) {
return
}
lib, ok := module.linker.(*libraryDecorator)
if !ok {
// Not a cc_library module
return
}
if !lib.header() {
// Not a cc_library_headers module
if ctx.ModuleType() != "cc_library_headers" {
return
}
lib, _ := module.linker.(*libraryDecorator)
// list of directories that will be added to the include path (using -I) for this
// module and any module that links against this module.
includeDirs := lib.flagExporter.Properties.Export_system_include_dirs