Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc330d66 authored by Martin Stjernholm's avatar Martin Stjernholm
Browse files

Do not propagate dynamic dependencies for stub libs.

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
parent ef720013
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -375,7 +375,10 @@ func (p *nativeLibInfoProperties) PopulateFromVariant(ctx android.SdkMemberConte
		specifiedDeps := specifiedDeps{}
		specifiedDeps = ccModule.linker.linkerSpecifiedDeps(specifiedDeps)

		if !ccModule.HasStubsVariants() {
			// Propagate dynamic dependencies for implementation libs, but not stubs.
			p.SharedLibs = specifiedDeps.sharedLibs
		}
		p.SystemSharedLibs = specifiedDeps.systemSharedLibs
	}
	p.exportedGeneratedHeaders = ccModule.ExportedGeneratedHeaders()
+5 −0
Original line number Diff line number Diff line
@@ -1748,8 +1748,13 @@ func TestStubsLibrary(t *testing.T) {
			native_shared_libs: ["stubslib"],
		}

		cc_library {
			name: "internaldep",
		}

		cc_library {
			name: "stubslib",
			shared_libs: ["internaldep"],
			stubs: {
				symbol_file: "some/where/stubslib.map.txt",
				versions: ["1", "2", "3"],