From 5257503fa58c8c9d79051a7c691bfba3a9ef1c02 Mon Sep 17 00:00:00 2001 From: Jeffrey Huang Date: Tue, 11 Feb 2020 17:33:45 -0800 Subject: Add libstats_jni to linkerconfig/namespace As part of statsd becoming a Mainline module, moving libstats_jni to the apex requires adding it to the linker namespace here. Bug: 145922701 Test: m -j Change-Id: Ifcbea47cc36604e4a86df9af711d678b23012724 --- libnativeloader/native_loader_test.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'libnativeloader/native_loader_test.cpp') diff --git a/libnativeloader/native_loader_test.cpp b/libnativeloader/native_loader_test.cpp index 7064c161a2..75cbc601bc 100644 --- a/libnativeloader/native_loader_test.cpp +++ b/libnativeloader/native_loader_test.cpp @@ -99,6 +99,7 @@ static std::unordered_map namespac {"vndk", TO_MOCK_NAMESPACE(TO_ANDROID_NAMESPACE("vndk"))}, {"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"))}, }; // The actual gmock object @@ -356,6 +357,7 @@ class NativeLoaderTest_Create : public NativeLoaderTest { 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(); std::string expected_shared_libs_to_sphal_ns = vendor_public_libraries(); @@ -363,6 +365,7 @@ class NativeLoaderTest_Create : public NativeLoaderTest { 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() { NativeLoaderTest::SetExpectations(); @@ -412,6 +415,11 @@ class NativeLoaderTest_Create : public NativeLoaderTest { 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))) + .WillOnce(Return(true)); + } } void RunTest() { -- cgit v1.2.3-59-g8ed1b