From 3db26d596bdc969b6d0e8646ac0ab64346b7ee21 Mon Sep 17 00:00:00 2001 From: Justin Yun Date: Mon, 16 Dec 2019 14:09:39 +0900 Subject: Make product libs available to unbundled product apks. Unbundling product apps must be triggerred if the target is enforcing the product interfaces. The device must have ro.product.vndk.version property if its product interface is enforced. Unbundled product apps can use product libraries. Bug: 144534640 Bug: 127738095 Bug: 128557860 Test: check boot and basic features Change-Id: I32b2a1bd3e4f62b6acdbfab6bd277ec1132478a2 --- libnativeloader/native_loader_test.cpp | 39 ++++++++++------------------------ 1 file changed, 11 insertions(+), 28 deletions(-) (limited to 'libnativeloader/native_loader_test.cpp') diff --git a/libnativeloader/native_loader_test.cpp b/libnativeloader/native_loader_test.cpp index ae99b97b04..88964b7a85 100644 --- a/libnativeloader/native_loader_test.cpp +++ b/libnativeloader/native_loader_test.cpp @@ -483,7 +483,7 @@ TEST_P(NativeLoaderTest_Create, UnbundledVendorApp) { RunTest(); } -TEST_P(NativeLoaderTest_Create, BundledProductApp_pre30) { +TEST_P(NativeLoaderTest_Create, BundledProductApp) { dex_path = "/product/app/foo/foo.apk"; is_shared = true; @@ -493,36 +493,19 @@ TEST_P(NativeLoaderTest_Create, BundledProductApp_pre30) { RunTest(); } -TEST_P(NativeLoaderTest_Create, BundledProductApp_post30) { - dex_path = "/product/app/foo/foo.apk"; - is_shared = true; - target_sdk_version = 30; - - expected_namespace_name = "classloader-namespace-shared"; - expected_namespace_flags |= ANDROID_NAMESPACE_TYPE_SHARED; - SetExpectations(); - RunTest(); -} - -TEST_P(NativeLoaderTest_Create, UnbundledProductApp_pre30) { - dex_path = "/product/app/foo/foo.apk"; - is_shared = false; - SetExpectations(); - RunTest(); -} - -TEST_P(NativeLoaderTest_Create, UnbundledProductApp_post30) { +TEST_P(NativeLoaderTest_Create, UnbundledProductApp) { dex_path = "/product/app/foo/foo.apk"; is_shared = false; - target_sdk_version = 30; - expected_namespace_name = "vendor-classloader-namespace"; - expected_library_path = expected_library_path + ":/product/" LIB_DIR ":/system/product/" LIB_DIR; - expected_permitted_path = - expected_permitted_path + ":/product/" LIB_DIR ":/system/product/" LIB_DIR; - expected_shared_libs_to_platform_ns = - expected_shared_libs_to_platform_ns + ":" + llndk_libraries(); - expected_link_with_vndk_ns = true; + if (is_product_vndk_version_defined()) { + expected_namespace_name = "vendor-classloader-namespace"; + expected_library_path = expected_library_path + ":/product/" LIB_DIR ":/system/product/" LIB_DIR; + expected_permitted_path = + expected_permitted_path + ":/product/" LIB_DIR ":/system/product/" LIB_DIR; + expected_shared_libs_to_platform_ns = + expected_shared_libs_to_platform_ns + ":" + llndk_libraries(); + expected_link_with_vndk_ns = true; + } SetExpectations(); RunTest(); } -- cgit v1.2.3-59-g8ed1b