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 "Do not add bootstrap libs as providing from apex" am: 570147469f am: 40f770951d am: 557b3d228a 

Change-Id: I076542ad1f1c42ea01cf6fb46515764d17d1ab19
This commit is contained in:
Automerger Merge Worker 2020-02-07 08:20:49 +00:00
parent 7dac929731 557b3d228a
commit b86c8583bf
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apex/apex.go
View File

@ -2059,11 +2059,12 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) {
} }
switch depTag { switch depTag {
case sharedLibTag: case sharedLibTag:
if cc, ok := child.(*cc.Module); ok { if c, ok := child.(*cc.Module); ok {
if cc.HasStubsVariants() { // bootstrap bionic libs are treated as provided by system
provideNativeLibs = append(provideNativeLibs, cc.OutputFile().Path().Base()) if c.HasStubsVariants() && !cc.InstallToBootstrap(c.BaseModuleName(), ctx.Config()) {
provideNativeLibs = append(provideNativeLibs, c.OutputFile().Path().Base())
} }
filesInfo = append(filesInfo, apexFileForNativeLibrary(ctx, cc, handleSpecialLibs)) filesInfo = append(filesInfo, apexFileForNativeLibrary(ctx, c, handleSpecialLibs))
return true // track transitive dependencies return true // track transitive dependencies
} else { } else {
ctx.PropertyErrorf("native_shared_libs", "%q is not a cc_library or cc_library_shared module", depName) ctx.PropertyErrorf("native_shared_libs", "%q is not a cc_library or cc_library_shared module", depName)