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

Do not propagate dynamic dependencies for stub libs.

Browse Source 
Test: m nothing
Test: Build an SDK snapshot including libc, check that the generated
  cc_prebuilt_library_shared for it is a stub that doesn't depend on
  ld-android.
Bug: 152255951
Bug: 154310674
Change-Id: Ie5ec02aebdf00b75756a6eda40db821488d30065
This commit is contained in:
Martin Stjernholm
2020-04-21 20:45:35 +01:00
parent ef720013ef
commit cc330d665a
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cc/library_sdk_member.go
View File

@@ -375,7 +375,10 @@ func (p *nativeLibInfoProperties) PopulateFromVariant(ctx android.SdkMemberConte
specifiedDeps := specifiedDeps{} specifiedDeps := specifiedDeps{}
specifiedDeps = ccModule.linker.linkerSpecifiedDeps(specifiedDeps) specifiedDeps = ccModule.linker.linkerSpecifiedDeps(specifiedDeps)
p.SharedLibs = specifiedDeps.sharedLibs if !ccModule.HasStubsVariants() {
// Propagate dynamic dependencies for implementation libs, but not stubs.
p.SharedLibs = specifiedDeps.sharedLibs
}
p.SystemSharedLibs = specifiedDeps.systemSharedLibs p.SystemSharedLibs = specifiedDeps.systemSharedLibs
} }
p.exportedGeneratedHeaders = ccModule.ExportedGeneratedHeaders() p.exportedGeneratedHeaders = ccModule.ExportedGeneratedHeaders()

5
sdk/cc_sdk_test.go
View File

@@ -1748,8 +1748,13 @@ func TestStubsLibrary(t *testing.T) {
native_shared_libs: ["stubslib"], native_shared_libs: ["stubslib"],
} }
cc_library {
name: "internaldep",
}
cc_library { cc_library {
name: "stubslib", name: "stubslib",
shared_libs: ["internaldep"],
stubs: { stubs: {
symbol_file: "some/where/stubslib.map.txt", symbol_file: "some/where/stubslib.map.txt",
versions: ["1", "2", "3"], versions: ["1", "2", "3"],