Merge "Clean up LLNDK stubs" into main (ed9005b5) · Commits · e / os / android_build_soong

apex/apex_test.go

+1 −1

Original line number	Diff line number	Diff line
		@@ -2068,7 +2068,7 @@ func TestApexMinSdkVersion_InVendorApex(t *testing.T) {

		// Ensure that mylib links with "current" LLNDK
		libFlags := names(mylib.Rule("ld").Args["libFlags"])
		ensureListContains(t, libFlags, "out/soong/.intermediates/libbar/"+vendorVariant+"_shared_current/libbar.so")
		ensureListContains(t, libFlags, "out/soong/.intermediates/libbar/"+vendorVariant+"_shared/libbar.so")

		// Ensure that mylib is targeting 29
		ccRule := ctx.ModuleForTests("mylib", vendorVariant+"_static_apex29").Output("obj/mylib.o")

+0 −2

Original line number	Diff line number	Diff line
		@@ -2680,9 +2680,7 @@ func TestLlndkLibrary(t *testing.T) {
		}
		}
		expected := []string{
		"android_vendor.29_arm64_armv8-a_shared_current",
		"android_vendor.29_arm64_armv8-a_shared",
		"android_vendor.29_arm_armv7-a-neon_shared_current",
		"android_vendor.29_arm_armv7-a-neon_shared",
		}
		android.AssertArrayString(t, "variants for llndk stubs", expected, actual)

+6 −7

Original line number	Diff line number	Diff line
		@@ -1915,12 +1915,15 @@ func (library *libraryDecorator) stubsVersions(ctx android.BaseMutatorContext) [
		}

		if library.hasLLNDKStubs() && ctx.Module().(*Module).InVendorOrProduct() {
		// LLNDK libraries only need a single stubs variant.
		return []string{android.FutureApiLevel.String()}
		// LLNDK libraries only need a single stubs variant (""), which is
		// added automatically in createVersionVariations().
		return nil
		}

		// Future API level is implicitly added if there isn't
		return addCurrentVersionIfNotPresent(library.Properties.Stubs.Versions)
		versions := addCurrentVersionIfNotPresent(library.Properties.Stubs.Versions)
		normalizeVersions(ctx, versions)
		return versions
		}

		func addCurrentVersionIfNotPresent(vers []string) []string {
		@@ -2292,10 +2295,6 @@ func setStubsVersions(mctx android.BottomUpMutatorContext, library libraryInterf
		return
		}
		versions := library.stubsVersions(mctx)
		if len(versions) <= 0 {
		return
		}
		normalizeVersions(mctx, versions)
		if mctx.Failed() {
		return
		}