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

Commit a6c19f79 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Do not propagate dynamic dependencies for stub libs."

parents ef98e291 cc330d66

cc/library_sdk_member.go

+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()

sdk/cc_sdk_test.go

+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"],