StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Do not add bootstrap libs as providing from apex" am: 570147469f am: 40f770951d

Browse Source 
Change-Id: I46eae7087249fd87dea8e54242e6e94f3ea59c8a
This commit is contained in:
Automerger Merge Worker
2020-02-07 08:06:33 +00:00
parent fd74d2ad14 40f770951d
commit 557b3d228a
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
apex/apex.go
View File

@@ -2054,11 +2054,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)