commit 5f8e7e2ae2e7ba1167bd0cbb050cf313d6bbfaf0
author Zhenhua WANG <zhenhua.wang@intel.com> Mon Feb 27 13:32:36 2017 +0800
committer Daniel Cardenas <danielcar@google.com> Fri Apr 07 10:44:46 2017 -0700
tree 39cb3236cbe571ee2004bd43208ba0a157e9c0bb
parent e3f991ff5751960a6b190720fac58a744cf4902d

Update NativeBridge interface in ART test

Add "linked namespace" interface.

Bug: 37123321
Test: make test-art-host-run-test-115-native-bridge
Test: Fugu: netflix, play movies, youtube

cherry picked from commit 11cb79ff5d5a49357e2db350b95f249d897cf27f

Change-Id: Ic7a778ac72c4c6d030cfe7dba25bf19ed8138b63

test/115-native-bridge/nativebridge.cc

diff --git a/test/115-native-bridge/nativebridge.cc b/test/115-native-bridge/nativebridge.cc
index f913cf6..87287f8 100644
--- a/test/115-native-bridge/nativebridge.cc
+++ b/test/115-native-bridge/nativebridge.cc
@@ -446,9 +446,9 @@
   return false;
 }
 
-extern "C" bool native_bridge_initNamespace(const char*  public_ns_sonames ATTRIBUTE_UNUSED,
-                                            const char*  anon_ns_library_path ATTRIBUTE_UNUSED) {
-  printf("Initializing namespaces in native bridge.\n");
+extern "C" bool native_bridge_initAnonymousNamespace(const char* public_ns_sonames ATTRIBUTE_UNUSED,
+                                                     const char* anon_ns_library_path ATTRIBUTE_UNUSED) {
+  printf("Initializing anonymous namespace in native bridge.\n");
   return false;
 }
 
@@ -463,6 +463,13 @@
   return nullptr;
 }
 
+extern "C" bool native_bridge_linkNamespaces(android::native_bridge_namespace_t* from ATTRIBUTE_UNUSED,
+                                             android::native_bridge_namespace_t* to ATTRIBUTE_UNUSED,
+                                             const char* shared_libs_sonames ATTRIBUTE_UNUSED) {
+  printf("Linking namespaces in native bridge.\n");
+  return false;
+}
+
 extern "C" void* native_bridge_loadLibraryExt(const char* libpath ATTRIBUTE_UNUSED,
                                                int flag ATTRIBUTE_UNUSED,
                                                android::native_bridge_namespace_t* ns ATTRIBUTE_UNUSED) {
@@ -487,7 +494,8 @@
   .unloadLibrary = &native_bridge_unloadLibrary,
   .getError = &native_bridge_getError,
   .isPathSupported = &native_bridge_isPathSupported,
-  .initNamespace = &native_bridge_initNamespace,
+  .initAnonymousNamespace = &native_bridge_initAnonymousNamespace,
   .createNamespace = &native_bridge_createNamespace,
+  .linkNamespaces = &native_bridge_linkNamespaces,
   .loadLibraryExt = &native_bridge_loadLibraryExt
 };