diff options
| author | Jooyung Han <jooyung@google.com> | 2020-02-08 03:53:54 +0900 |
|---|---|---|
| committer | Treehugger Robot <treehugger-gerrit@google.com> | 2020-02-11 19:00:38 +0000 |
| commit | 98cf82f227fa8fab694674e72a9a2ca95face4b5 (patch) | |
| tree | 104b438ec54707e44648ad2e26a65a9774a0a50f /libnativeloader/native_loader_test.cpp | |
| parent | 089c1357c6e5457a7bd5e76f70cead52517d9b0b (diff) | |
Use apex name for apex linker namespace
Linkerconfig now uses apex_names to automatically generate linker
namespaces from apexes.
Bug: 148826508
Test: build / boot
Change-Id: Id7fa68531033124727e618284af4fd2a61bdd85f
Diffstat (limited to 'libnativeloader/native_loader_test.cpp')
| -rw-r--r-- | libnativeloader/native_loader_test.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libnativeloader/native_loader_test.cpp b/libnativeloader/native_loader_test.cpp index e73af6d084..39cc753aa4 100644 --- a/libnativeloader/native_loader_test.cpp +++ b/libnativeloader/native_loader_test.cpp @@ -94,11 +94,11 @@ 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"))}, - {"art", TO_MOCK_NAMESPACE(TO_ANDROID_NAMESPACE("art"))}, + {"com.android.art", TO_MOCK_NAMESPACE(TO_ANDROID_NAMESPACE("com.android.art"))}, {"sphal", TO_MOCK_NAMESPACE(TO_ANDROID_NAMESPACE("sphal"))}, {"vndk", TO_MOCK_NAMESPACE(TO_ANDROID_NAMESPACE("vndk"))}, - {"neuralnetworks", TO_MOCK_NAMESPACE(TO_ANDROID_NAMESPACE("neuralnetworks"))}, - {"cronet", TO_MOCK_NAMESPACE(TO_ANDROID_NAMESPACE("cronet"))}, + {"com.android.neuralnetworks", TO_MOCK_NAMESPACE(TO_ANDROID_NAMESPACE("com.android.neuralnetworks"))}, + {"com.android.cronet", TO_MOCK_NAMESPACE(TO_ANDROID_NAMESPACE("com.android.cronet"))}, }; // The actual gmock object @@ -383,7 +383,7 @@ class NativeLoaderTest_Create : public NativeLoaderTest { .WillOnce(Return(true)); } if (expected_link_with_art_ns) { - EXPECT_CALL(*mock, mock_link_namespaces(Eq(IsBridged()), _, NsEq("art"), + EXPECT_CALL(*mock, mock_link_namespaces(Eq(IsBridged()), _, NsEq("com.android.art"), StrEq(expected_shared_libs_to_art_ns))) .WillOnce(Return(true)); } @@ -403,12 +403,12 @@ class NativeLoaderTest_Create : public NativeLoaderTest { .WillOnce(Return(true)); } if (expected_link_with_neuralnetworks_ns) { - EXPECT_CALL(*mock, mock_link_namespaces(Eq(IsBridged()), _, NsEq("neuralnetworks"), + EXPECT_CALL(*mock, mock_link_namespaces(Eq(IsBridged()), _, NsEq("com.android.neuralnetworks"), 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("cronet"), + EXPECT_CALL(*mock, mock_link_namespaces(Eq(IsBridged()), _, NsEq("com.android.cronet"), StrEq(expected_shared_libs_to_cronet_ns))) .WillOnce(Return(true)); } |