diff options
| author | Victor Chang <vichang@google.com> | 2020-05-05 16:01:19 +0100 |
|---|---|---|
| committer | vichang <vichang@google.com> | 2020-05-07 09:34:47 +0000 |
| commit | d20e51dcd0fc4b2b229c5b6a5e9b500ae042bc61 (patch) | |
| tree | 2ef7925b2e89c77cee31144a25932a198cd4b65e /libnativeloader/native_loader_test.cpp | |
| parent | a6653d304faa3bbd981507570a4ac1107760c6a7 (diff) | |
"Move ICU from ART APEX to i18n APEX" Attempt 2
The change was previously submitted in https://r.android.com/1283897
"Calling @IntraCoreApi from core-icu4j should not cause Core platform API violation"
https://r.android.com/1299494
Bug: 138994281
Test: m checkbuild on aosp_x86-userdebug
Test: device boots
Change-Id: Idb3e2450fca5d8300aef353fc1e4e99e24f04372
Diffstat (limited to 'libnativeloader/native_loader_test.cpp')
| -rw-r--r-- | libnativeloader/native_loader_test.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/libnativeloader/native_loader_test.cpp b/libnativeloader/native_loader_test.cpp index 66d7531b35..e64e1a518c 100644 --- a/libnativeloader/native_loader_test.cpp +++ b/libnativeloader/native_loader_test.cpp @@ -97,7 +97,7 @@ class Platform { static std::unordered_map<std::string, Platform::mock_namespace_handle> namespaces = { {"system", TO_MOCK_NAMESPACE(TO_ANDROID_NAMESPACE("system"))}, {"default", TO_MOCK_NAMESPACE(TO_ANDROID_NAMESPACE("default"))}, - {"com_android_art", TO_MOCK_NAMESPACE(TO_ANDROID_NAMESPACE("com_android_art"))}, + {"com_android_i18n", TO_MOCK_NAMESPACE(TO_ANDROID_NAMESPACE("com_android_i18n"))}, {"sphal", TO_MOCK_NAMESPACE(TO_ANDROID_NAMESPACE("sphal"))}, {"vndk", TO_MOCK_NAMESPACE(TO_ANDROID_NAMESPACE("vndk"))}, {"vndk_product", TO_MOCK_NAMESPACE(TO_ANDROID_NAMESPACE("vndk_product"))}, @@ -355,6 +355,7 @@ class NativeLoaderTest_Create : public NativeLoaderTest { std::string expected_parent_namespace = "system"; bool expected_link_with_platform_ns = true; bool expected_link_with_art_ns = true; + bool expected_link_with_i18n_ns = true; bool expected_link_with_sphal_ns = !vendor_public_libraries().empty(); bool expected_link_with_vndk_ns = false; bool expected_link_with_vndk_product_ns = false; @@ -363,6 +364,7 @@ class NativeLoaderTest_Create : public NativeLoaderTest { bool expected_link_with_statsd_ns = true; std::string expected_shared_libs_to_platform_ns = default_public_libraries(); std::string expected_shared_libs_to_art_ns = art_public_libraries(); + std::string expected_shared_libs_to_i18n_ns = i18n_public_libraries(); std::string expected_shared_libs_to_sphal_ns = vendor_public_libraries(); std::string expected_shared_libs_to_vndk_ns = vndksp_libraries_vendor(); std::string expected_shared_libs_to_vndk_product_ns = vndksp_libraries_product(); @@ -393,6 +395,11 @@ class NativeLoaderTest_Create : public NativeLoaderTest { StrEq(expected_shared_libs_to_art_ns))) .WillOnce(Return(true)); } + if (expected_link_with_i18n_ns) { + EXPECT_CALL(*mock, mock_link_namespaces(Eq(IsBridged()), _, NsEq("com_android_i18n"), + StrEq(expected_shared_libs_to_i18n_ns))) + .WillOnce(Return(true)); + } if (expected_link_with_sphal_ns) { EXPECT_CALL(*mock, mock_link_namespaces(Eq(IsBridged()), _, NsEq("sphal"), StrEq(expected_shared_libs_to_sphal_ns))) |