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

Commit 7d6e79bc authored by Jooyung Han's avatar Jooyung Han
Browse files

VNDK APEX: skips VNDK-Ext 

In legacy VNDK mode (DeviceVndkVesion=""), the check was missing. We
don't want VNDK-Ext in VNDK APEX in any case.

Bug: 191770320
Test: m nothing
Change-Id: I08f36a4c1696bf82d25d629841e172d2716a366d
parent 2afa8915

apex/apex_test.go

+96 −47
Original line number Diff line number Diff line
@@ -3338,6 +3338,37 @@ func ensureExactContents(t *testing.T, ctx *android.TestContext, moduleName, var 
}



func TestVndkApexCurrent(t *testing.T) {

	commonFiles := []string{

		"lib/libc++.so",

		"lib64/libc++.so",

		"etc/llndk.libraries.29.txt",

		"etc/vndkcore.libraries.29.txt",

		"etc/vndksp.libraries.29.txt",

		"etc/vndkprivate.libraries.29.txt",

		"etc/vndkproduct.libraries.29.txt",

	}

	testCases := []struct {

		vndkVersion   string

		expectedFiles []string

	}{

		{

			vndkVersion: "current",

			expectedFiles: append(commonFiles,

				"lib/libvndk.so",

				"lib/libvndksp.so",

				"lib64/libvndk.so",

				"lib64/libvndksp.so"),

		},

		{

			vndkVersion: "",

			expectedFiles: append(commonFiles,

				// Legacy VNDK APEX contains only VNDK-SP files (of core variant)

				"lib/libvndksp.so",

				"lib64/libvndksp.so"),

		},

	}

	for _, tc := range testCases {

		t.Run("VNDK.current with DeviceVndkVersion="+tc.vndkVersion, func(t *testing.T) {

			ctx := testApex(t, `

			apex_vndk {

				name: "com.android.vndk.current",
@@ -3377,22 +3408,40 @@ func TestVndkApexCurrent(t *testing.T) { 
				stl: "none",

				apex_available: [ "com.android.vndk.current" ],

			}

	`+vndkLibrariesTxtFiles("current"))



	ensureExactContents(t, ctx, "com.android.vndk.current", "android_common_image", []string{

		"lib/libvndk.so",

		"lib/libvndksp.so",

		"lib/libc++.so",

		"lib64/libvndk.so",

		"lib64/libvndksp.so",

		"lib64/libc++.so",

		"etc/llndk.libraries.29.txt",

		"etc/vndkcore.libraries.29.txt",

		"etc/vndksp.libraries.29.txt",

		"etc/vndkprivate.libraries.29.txt",

		"etc/vndkproduct.libraries.29.txt",

			// VNDK-Ext should not cause any problems



			cc_library {

				name: "libvndk.ext",

				srcs: ["mylib2.cpp"],

				vendor: true,

				vndk: {

					enabled: true,

					extends: "libvndk",

				},

				system_shared_libs: [],

				stl: "none",

			}



			cc_library {

				name: "libvndksp.ext",

				srcs: ["mylib2.cpp"],

				vendor: true,

				vndk: {

					enabled: true,

					support_system_process: true,

					extends: "libvndksp",

				},

				system_shared_libs: [],

				stl: "none",

			}

		`+vndkLibrariesTxtFiles("current"), android.FixtureModifyProductVariables(func(variables android.FixtureProductVariables) {

				variables.DeviceVndkVersion = proptools.StringPtr(tc.vndkVersion)

			}))

			ensureExactContents(t, ctx, "com.android.vndk.current", "android_common_image", tc.expectedFiles)

		})

	}

}



func TestVndkApexWithPrebuilt(t *testing.T) {

	ctx := testApex(t, `

cc/vndk.go

+1 −1
Original line number Diff line number Diff line
@@ -371,7 +371,7 @@ func IsForVndkApex(mctx android.BottomUpMutatorContext, m *Module) bool { 
			if mctx.ModuleName() == "libz" {

				return false

			}

			return m.ImageVariation().Variation == android.CoreVariation && lib.shared() && m.IsVndkSp()

			return m.ImageVariation().Variation == android.CoreVariation && lib.shared() && m.IsVndkSp() && !m.IsVndkExt()

		}



		useCoreVariant := m.VndkVersion() == mctx.DeviceConfig().PlatformVndkVersion() &&