commit 5c0177215ee88a9372b883d06661e25a8f6105de
author Luke Huang <huangluke@google.com> Tue Dec 17 10:54:26 2019 +0800
committer Luke Huang <huangluke@google.com> Tue Dec 17 15:57:03 2019 +0000
tree 94beb530125654c1af9cd91ada6abc5d10bb6a7f
parent c99a2310f980bab0211799b47dcf191bc2bf0163

Add public lib of Cronet apex mainline

This is a workaround since apex module library path is not
supported in jni

Bug: 139397529
Bug: 145474221
Test: Build
Test: manual test with Cronet
Test: atest CtsJniTestCases
Test: atest libnativeloader_test
Change-Id: Ifd8aa85bd78e95131b2ce3eab0ad32c2bb19cee2

libnativeloader/native_loader_test.cpp

diff --git a/libnativeloader/native_loader_test.cpp b/libnativeloader/native_loader_test.cpp
index 8a8193e..ae99b97 100644
--- a/libnativeloader/native_loader_test.cpp
+++ b/libnativeloader/native_loader_test.cpp
@@ -98,6 +98,7 @@
     {"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"))},
 };
 
 // The actual gmock object
@@ -354,12 +355,14 @@
   bool expected_link_with_vndk_ns = false;
   bool expected_link_with_default_ns = false;
   bool expected_link_with_neuralnetworks_ns = true;
+  bool expected_link_with_cronet_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();
   std::string expected_shared_libs_to_vndk_ns = vndksp_libraries();
   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();
 
   void SetExpectations() {
     NativeLoaderTest::SetExpectations();
@@ -404,6 +407,11 @@
                                               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"),
+                                              StrEq(expected_shared_libs_to_cronet_ns)))
+          .WillOnce(Return(true));
+    }
   }
 
   void RunTest() {