diff options
| author | Jooyung Han <jooyung@google.com> | 2020-03-03 01:07:37 +0900 |
|---|---|---|
| committer | Jooyung Han <jooyung@google.com> | 2020-03-04 06:08:15 +0000 |
| commit | 735ab4ef26c250510f21fc2070e08d4ae7867916 (patch) | |
| tree | 0e6e3f6873e32a3bd07bf4ae5f1b199a7e437a58 /libnativeloader/native_loader_test.cpp | |
| parent | 538f99ab285c1440969b9b3331fc0ce750c0d316 (diff) | |
libnativeloader: Remove hard-coded cronet
Because cronet apex sets its jni_libs, its classloader-namespace is
linked automatically via jni.config.txt.
Bug: 143733063
Bug: 146420818
Test: atest CronetApiTest
Change-Id: I7ae0f7bc60f09e7e384abd1f0a1e4f8f90f64052
Diffstat (limited to 'libnativeloader/native_loader_test.cpp')
| -rw-r--r-- | libnativeloader/native_loader_test.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/libnativeloader/native_loader_test.cpp b/libnativeloader/native_loader_test.cpp index e36a7e6de2..3f2505c2de 100644 --- a/libnativeloader/native_loader_test.cpp +++ b/libnativeloader/native_loader_test.cpp @@ -100,7 +100,6 @@ static std::unordered_map<std::string, Platform::mock_namespace_handle> namespac {"vndk", TO_MOCK_NAMESPACE(TO_ANDROID_NAMESPACE("vndk"))}, {"vndk_product", TO_MOCK_NAMESPACE(TO_ANDROID_NAMESPACE("vndk_product"))}, {"com_android_neuralnetworks", TO_MOCK_NAMESPACE(TO_ANDROID_NAMESPACE("com_android_neuralnetworks"))}, - {"com_android_cronet", TO_MOCK_NAMESPACE(TO_ANDROID_NAMESPACE("com_android_cronet"))}, {"com_android_os_statsd", TO_MOCK_NAMESPACE(TO_ANDROID_NAMESPACE("com_android_os_statsd"))}, }; @@ -359,7 +358,6 @@ class NativeLoaderTest_Create : public NativeLoaderTest { bool expected_link_with_vndk_product_ns = false; bool expected_link_with_default_ns = false; bool expected_link_with_neuralnetworks_ns = true; - bool expected_link_with_cronet_ns = true; 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(); @@ -368,7 +366,6 @@ class NativeLoaderTest_Create : public NativeLoaderTest { std::string expected_shared_libs_to_vndk_product_ns = vndksp_libraries_product(); std::string expected_shared_libs_to_default_ns = default_public_libraries(); std::string expected_shared_libs_to_neuralnetworks_ns = neuralnetworks_public_libraries(); - std::string expected_shared_libs_to_cronet_ns = cronet_public_libraries(); std::string expected_shared_libs_to_statsd_ns = statsd_public_libraries(); void SetExpectations() { @@ -419,11 +416,6 @@ class NativeLoaderTest_Create : public NativeLoaderTest { StrEq(expected_shared_libs_to_neuralnetworks_ns))) .WillOnce(Return(true)); } - if (expected_link_with_cronet_ns) { - EXPECT_CALL(*mock, mock_link_namespaces(Eq(IsBridged()), _, NsEq("com_android_cronet"), - StrEq(expected_shared_libs_to_cronet_ns))) - .WillOnce(Return(true)); - } if (expected_link_with_statsd_ns) { EXPECT_CALL(*mock, mock_link_namespaces(Eq(IsBridged()), _, NsEq("com_android_os_statsd"), StrEq(expected_shared_libs_to_statsd_ns))) |