From 1263402b99713aab1cd18303c41a3f3b17aa1f0f Mon Sep 17 00:00:00 2001 From: Jooyung Han Date: Fri, 28 Aug 2020 17:13:43 +0900 Subject: clean up statsd public libraries JNI library(libstat_jni) from statsd apex is handled via the build system and linkerconfig. Bug: 150767721 Test: presubmit Test: atest libnativeloader_test Change-Id: Ia7527f053508d5992c3eef209f77260f0d210e81 --- libnativeloader/native_loader_test.cpp | 8 -------- 1 file changed, 8 deletions(-) (limited to 'libnativeloader/native_loader_test.cpp') diff --git a/libnativeloader/native_loader_test.cpp b/libnativeloader/native_loader_test.cpp index 146ab5a5b9..43c3c151c9 100644 --- a/libnativeloader/native_loader_test.cpp +++ b/libnativeloader/native_loader_test.cpp @@ -99,7 +99,6 @@ static std::unordered_map namespac #define NAMESPACE_ENTRY(ns) {ns, TO_MOCK_NAMESPACE(TO_ANDROID_NAMESPACE(ns))} NAMESPACE_ENTRY("com_android_i18n"), NAMESPACE_ENTRY("com_android_neuralnetworks"), - NAMESPACE_ENTRY("com_android_os_statsd"), NAMESPACE_ENTRY("com_android_art"), NAMESPACE_ENTRY("default"), NAMESPACE_ENTRY("sphal"), @@ -367,7 +366,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_statsd_ns = true; std::string expected_shared_libs_to_platform_ns = default_public_libraries(); std::string expected_shared_libs_to_art_ns = apex_public_libraries().at("com_android_art"); std::string expected_shared_libs_to_i18n_ns = apex_public_libraries().at("com_android_i18n"); @@ -376,7 +374,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 = apex_public_libraries().at("com_android_neuralnetworks"); - std::string expected_shared_libs_to_statsd_ns = statsd_public_libraries(); void SetExpectations() { NativeLoaderTest::SetExpectations(); @@ -431,11 +428,6 @@ class NativeLoaderTest_Create : public NativeLoaderTest { StrEq(expected_shared_libs_to_neuralnetworks_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))) - .WillOnce(Return(true)); - } } void RunTest() { -- cgit v1.2.3-59-g8ed1b