Allow VNDK-SP extensions to use vendor lib
This commit changes the VNDK-SP dependencies check. With the commit,
VNDK-SP-Ext can link to non-VNDK vendor shared libs. This commit also
refines the "cc_test" so that more error handling cases are properly
tested.
Before this commit, VNDK-SP-Ext could not depend on vendor libs. It
was disallowed because there were no correct way to load vendor libs.
The fallback link had to specify the shared lib names. On the other
hand, adding "/vendor/${LIB}" to search paths will lead to
double-loading issue.
In aosp/595067, "allow_all_shared_libs" was added to bionic dynamic
linker. Now, we can link the "vndk" namespace to "sphal" namespace.
Thus, like VNDK-Ext, VNDK-SP-Ext can link to vendor libs now.
Bug: 77249955
Test: lunch aosp_walleye-userdebug && make -j8 # runs unit tests
Test: lunch aosp_sailfish-userdebug && make -j8 # runs unit tests
Test: Create a VNDK-SP-Ext, link to vendor libs, and run it.
Change-Id: I5511204539a22c998528111076f46756807faf29
diff --git a/cc/cc_test.go b/cc/cc_test.go
index 75aa290..d3ac43b 100644
--- a/cc/cc_test.go
+++ b/cc/cc_test.go
@@ -174,6 +174,7 @@
}
func testCcWithConfig(t *testing.T, bp string, config android.Config) *android.TestContext {
+ t.Helper()
ctx := createTestContext(t, config, bp)
_, errs := ctx.ParseFileList(".", []string{"Android.bp"})
@@ -185,6 +186,7 @@
}
func testCc(t *testing.T, bp string) *android.TestContext {
+ t.Helper()
config := android.TestArchConfig(buildDir, nil)
config.ProductVariables.DeviceVndkVersion = StringPtr("current")
config.ProductVariables.Platform_vndk_version = StringPtr("VER")
@@ -193,6 +195,7 @@
}
func testCcNoVndk(t *testing.T, bp string) *android.TestContext {
+ t.Helper()
config := android.TestArchConfig(buildDir, nil)
config.ProductVariables.Platform_vndk_version = StringPtr("VER")
@@ -200,6 +203,7 @@
}
func testCcError(t *testing.T, pattern string, bp string) {
+ t.Helper()
config := android.TestArchConfig(buildDir, nil)
config.ProductVariables.DeviceVndkVersion = StringPtr("current")
config.ProductVariables.Platform_vndk_version = StringPtr("VER")
@@ -256,6 +260,8 @@
func checkVndkModule(t *testing.T, ctx *android.TestContext, name, subDir string,
isVndkSp bool, extends string) {
+ t.Helper()
+
mod := ctx.ModuleForTests(name, vendorVariant).Module().(*Module)
if !mod.hasVendorVariant() {
t.Errorf("%q must have vendor variant", name)
@@ -339,6 +345,107 @@
checkVndkModule(t, ctx, "libvndk_sp_private", "vndk-sp-VER", true, "")
}
+func TestVndkDepError(t *testing.T) {
+ // Check whether an error is emitted when a VNDK lib depends on a system lib.
+ testCcError(t, "dependency \".*\" of \".*\" missing variant", `
+ cc_library {
+ name: "libvndk",
+ vendor_available: true,
+ vndk: {
+ enabled: true,
+ },
+ shared_libs: ["libfwk"], // Cause error
+ nocrt: true,
+ }
+
+ cc_library {
+ name: "libfwk",
+ nocrt: true,
+ }
+ `)
+
+ // Check whether an error is emitted when a VNDK lib depends on a vendor lib.
+ testCcError(t, "dependency \".*\" of \".*\" missing variant", `
+ cc_library {
+ name: "libvndk",
+ vendor_available: true,
+ vndk: {
+ enabled: true,
+ },
+ shared_libs: ["libvendor"], // Cause error
+ nocrt: true,
+ }
+
+ cc_library {
+ name: "libvendor",
+ vendor: true,
+ nocrt: true,
+ }
+ `)
+
+ // Check whether an error is emitted when a VNDK-SP lib depends on a system lib.
+ testCcError(t, "dependency \".*\" of \".*\" missing variant", `
+ cc_library {
+ name: "libvndk_sp",
+ vendor_available: true,
+ vndk: {
+ enabled: true,
+ support_system_process: true,
+ },
+ shared_libs: ["libfwk"], // Cause error
+ nocrt: true,
+ }
+
+ cc_library {
+ name: "libfwk",
+ nocrt: true,
+ }
+ `)
+
+ // Check whether an error is emitted when a VNDK-SP lib depends on a vendor lib.
+ testCcError(t, "dependency \".*\" of \".*\" missing variant", `
+ cc_library {
+ name: "libvndk_sp",
+ vendor_available: true,
+ vndk: {
+ enabled: true,
+ support_system_process: true,
+ },
+ shared_libs: ["libvendor"], // Cause error
+ nocrt: true,
+ }
+
+ cc_library {
+ name: "libvendor",
+ vendor: true,
+ nocrt: true,
+ }
+ `)
+
+ // Check whether an error is emitted when a VNDK-SP lib depends on a VNDK lib.
+ testCcError(t, "module \".*\" variant \".*\": \\(.*\\) should not link to \".*\"", `
+ cc_library {
+ name: "libvndk_sp",
+ vendor_available: true,
+ vndk: {
+ enabled: true,
+ support_system_process: true,
+ },
+ shared_libs: ["libvndk"], // Cause error
+ nocrt: true,
+ }
+
+ cc_library {
+ name: "libvndk",
+ vendor_available: true,
+ vndk: {
+ enabled: true,
+ },
+ nocrt: true,
+ }
+ `)
+}
+
func TestVndkExt(t *testing.T) {
// This test checks the VNDK-Ext properties.
ctx := testCc(t, `
@@ -365,7 +472,7 @@
checkVndkModule(t, ctx, "libvndk_ext", "vndk", false, "libvndk")
}
-func TestVndkExtNoVndk(t *testing.T) {
+func TestVndkExtWithoutBoardVndkVersion(t *testing.T) {
// This test checks the VNDK-Ext properties when BOARD_VNDK_VERSION is not set.
ctx := testCcNoVndk(t, `
cc_library {
@@ -486,7 +593,7 @@
}
func TestVndkExtVendorAvailableFalseError(t *testing.T) {
- // This test ensures an error is emitted when a vndk-ext library extends a vndk library
+ // This test ensures an error is emitted when a VNDK-Ext library extends a VNDK library
// with `vendor_available: false`.
testCcError(t, "`extends` refers module \".*\" which does not have `vendor_available: true`", `
cc_library {
@@ -510,8 +617,8 @@
`)
}
-func TestVendorModuleUsesVndkExt(t *testing.T) {
- // This test ensures a vendor module can depend on a vndk-ext library.
+func TestVendorModuleUseVndkExt(t *testing.T) {
+ // This test ensures a vendor module can depend on a VNDK-Ext library.
testCc(t, `
cc_library {
name: "libvndk",
@@ -563,8 +670,8 @@
`)
}
-func TestVndkExtUsesVendorLib(t *testing.T) {
- // This test ensures a vndk-ext library can depend on a vendor library.
+func TestVndkExtUseVendorLib(t *testing.T) {
+ // This test ensures a VNDK-Ext library can depend on a vendor library.
testCc(t, `
cc_library {
name: "libvndk",
@@ -592,12 +699,9 @@
nocrt: true,
}
`)
-}
-func TestVndkSpExtUsesVendorLibError(t *testing.T) {
- // This test ensures an error is emitted if a vndk-sp-ext library depends on a vendor
- // library.
- testCcError(t, "module \".*\" variant \".*\": \\(.*\\) should not link to \".*\"", `
+ // This test ensures a VNDK-SP-Ext library can depend on a vendor library.
+ testCc(t, `
cc_library {
name: "libvndk_sp",
vendor_available: true,
@@ -628,9 +732,91 @@
`)
}
-func TestVndkUsesVndkExtError(t *testing.T) {
- // This test ensures an error is emitted if a vndk/vndk-sp library depends on a
- // vndk-ext/vndk-sp-ext library.
+func TestVndkSpExtUseVndkError(t *testing.T) {
+ // This test ensures an error is emitted if a VNDK-SP-Ext library depends on a VNDK
+ // library.
+ testCcError(t, "module \".*\" variant \".*\": \\(.*\\) should not link to \".*\"", `
+ cc_library {
+ name: "libvndk",
+ vendor_available: true,
+ vndk: {
+ enabled: true,
+ },
+ nocrt: true,
+ }
+
+ cc_library {
+ name: "libvndk_sp",
+ vendor_available: true,
+ vndk: {
+ enabled: true,
+ support_system_process: true,
+ },
+ nocrt: true,
+ }
+
+ cc_library {
+ name: "libvndk_sp_ext",
+ vendor: true,
+ vndk: {
+ enabled: true,
+ extends: "libvndk_sp",
+ support_system_process: true,
+ },
+ shared_libs: ["libvndk"], // Cause an error
+ nocrt: true,
+ }
+ `)
+
+ // This test ensures an error is emitted if a VNDK-SP-Ext library depends on a VNDK-Ext
+ // library.
+ testCcError(t, "module \".*\" variant \".*\": \\(.*\\) should not link to \".*\"", `
+ cc_library {
+ name: "libvndk",
+ vendor_available: true,
+ vndk: {
+ enabled: true,
+ },
+ nocrt: true,
+ }
+
+ cc_library {
+ name: "libvndk_ext",
+ vendor: true,
+ vndk: {
+ enabled: true,
+ extends: "libvndk",
+ },
+ nocrt: true,
+ }
+
+ cc_library {
+ name: "libvndk_sp",
+ vendor_available: true,
+ vndk: {
+ enabled: true,
+ support_system_process: true,
+ },
+ nocrt: true,
+ }
+
+ cc_library {
+ name: "libvndk_sp_ext",
+ vendor: true,
+ vndk: {
+ enabled: true,
+ extends: "libvndk_sp",
+ support_system_process: true,
+ },
+ shared_libs: ["libvndk_ext"], // Cause an error
+ nocrt: true,
+ }
+ `)
+}
+
+func TestVndkUseVndkExtError(t *testing.T) {
+ // This test ensures an error is emitted if a VNDK/VNDK-SP library depends on a
+ // VNDK-Ext/VNDK-SP-Ext library.
testCcError(t, "dependency \".*\" of \".*\" missing variant", `
cc_library {
name: "libvndk",