Fix: build error when a lib with stubs is included in an APEX (0d29b00d) · Commits · e / os / android_build_soong

apex/apex.go

+1 −0

Original line number	Diff line number	Diff line
		@@ -367,6 +367,7 @@ func addDependenciesForNativeModules(ctx android.BottomUpMutatorContext,
		{Mutator: "arch", Variation: arch},
		{Mutator: "image", Variation: "core"},
		{Mutator: "link", Variation: "shared"},
		{Mutator: "version", Variation: ""}, // "" is the non-stub variant
		}, sharedLibTag, native_shared_libs...)

		ctx.AddFarVariationDependencies([]blueprint.Variation{

+10 −2

Original line number	Diff line number	Diff line
		@@ -277,12 +277,20 @@ func TestApexWithStubs(t *testing.T) {
		cc_library {
		name: "mylib3",
		srcs: ["mylib.cpp"],
		shared_libs: ["mylib4"],
		system_shared_libs: [],
		stl: "none",
		stubs: {
		versions: ["10", "11", "12"],
		},
		}

		cc_library {
		name: "mylib4",
		srcs: ["mylib.cpp"],
		system_shared_libs: [],
		stl: "none",
		}
		`)

		apexRule := ctx.ModuleForTests("myapex", "android_common_myapex").Rule("apexRule")