Update ABI definitions for pruned libnative{bridge,loader}.map.txt.

These libraries have been platform internal up to and including R. They
are reclassified as system APIs in S due to ART becoming an updatable
module, but there is no released platform version to maintain
compatibility with yet.

Test: m TARGET_PRODUCT=aosp_arm64 TARGET_BUILD_VARIANT=userdebug
Bug: 122710865
Change-Id: Id6b4f93a8ac7eb7406fd963923b56516eb5eba1a

12 files changed, 0 insertions, 1728 deletions

diff --git a/S/64/arm64_armv8-a/source-based/libnativebridge.so.lsdump b/S/64/arm64_armv8-a/source-based/libnativebridge.so.lsdump
index 688c154..63981bb 100644
--- a/S/64/arm64_armv8-a/source-based/libnativebridge.so.lsdump
+++ b/S/64/arm64_armv8-a/source-based/libnativebridge.so.lsdump
@@ -124,73 +124,22 @@
  "elf_functions" :
  [
   {
-   "name" : "InitializeNativeBridge"
-  },
-  {
-   "name" : "LoadNativeBridge"
-  },
-  {
    "name" : "NativeBridgeAvailable"
   },
   {
-   "name" : "NativeBridgeCreateNamespace"
-  },
-  {
-   "name" : "NativeBridgeError"
-  },
-  {
    "name" : "NativeBridgeGetError"
   },
   {
-   "name" : "NativeBridgeGetExportedNamespace"
-  },
-  {
-   "name" : "NativeBridgeGetSignalHandler"
-  },
-  {
    "name" : "NativeBridgeGetTrampoline"
   },
   {
-   "name" : "NativeBridgeGetVersion"
-  },
-  {
-   "name" : "NativeBridgeInitAnonymousNamespace"
-  },
-  {
    "name" : "NativeBridgeInitialized"
   },
   {
-   "name" : "NativeBridgeIsPathSupported"
-  },
-  {
-   "name" : "NativeBridgeIsSupported"
-  },
-  {
-   "name" : "NativeBridgeLinkNamespaces"
-  },
-  {
-   "name" : "NativeBridgeLoadLibrary"
-  },
-  {
-   "name" : "NativeBridgeLoadLibraryExt"
-  },
-  {
-   "name" : "NativeBridgeNameAcceptable"
-  },
-  {
-   "name" : "NativeBridgeUnloadLibrary"
-  },
-  {
    "name" : "NeedsNativeBridge"
   },
   {
    "name" : "PreInitializeNativeBridge"
-  },
-  {
-   "name" : "PreZygoteForkNativeBridge"
-  },
-  {
-   "name" : "UnloadNativeBridge"
   }
  ],
  "elf_objects" : [],
@@ -5491,105 +5440,18 @@
  "functions" :
  [
   {
-   "function_name" : "android::InitializeNativeBridge",
-   "linker_set_key" : "InitializeNativeBridge",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP7_JNIEnv"
-    },
-    {
-     "referenced_type" : "_ZTIPKc"
-    }
-   ],
-   "return_type" : "_ZTIb",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::LoadNativeBridge",
-   "linker_set_key" : "LoadNativeBridge",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    },
-    {
-     "referenced_type" : "_ZTIPKN7android28NativeBridgeRuntimeCallbacksE"
-    }
-   ],
-   "return_type" : "_ZTIb",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
    "function_name" : "android::NativeBridgeAvailable",
    "linker_set_key" : "NativeBridgeAvailable",
    "return_type" : "_ZTIb",
    "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
   },
   {
-   "function_name" : "android::NativeBridgeCreateNamespace",
-   "linker_set_key" : "NativeBridgeCreateNamespace",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    },
-    {
-     "referenced_type" : "_ZTIPKc"
-    },
-    {
-     "referenced_type" : "_ZTIPKc"
-    },
-    {
-     "referenced_type" : "_ZTIm"
-    },
-    {
-     "referenced_type" : "_ZTIPKc"
-    },
-    {
-     "referenced_type" : "_ZTIPN7android25native_bridge_namespace_tE"
-    }
-   ],
-   "return_type" : "_ZTIPN7android25native_bridge_namespace_tE",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::NativeBridgeError",
-   "linker_set_key" : "NativeBridgeError",
-   "return_type" : "_ZTIb",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
    "function_name" : "android::NativeBridgeGetError",
    "linker_set_key" : "NativeBridgeGetError",
    "return_type" : "_ZTIPKc",
    "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
   },
   {
-   "function_name" : "android::NativeBridgeGetExportedNamespace",
-   "linker_set_key" : "NativeBridgeGetExportedNamespace",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    }
-   ],
-   "return_type" : "_ZTIPN7android25native_bridge_namespace_tE",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::NativeBridgeGetSignalHandler",
-   "linker_set_key" : "NativeBridgeGetSignalHandler",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIPFbiP7siginfoPvE",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
    "function_name" : "android::NativeBridgeGetTrampoline",
    "linker_set_key" : "NativeBridgeGetTrampoline",
    "parameters" :
@@ -5611,132 +5473,12 @@
    "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
   },
   {
-   "function_name" : "android::NativeBridgeGetVersion",
-   "linker_set_key" : "NativeBridgeGetVersion",
-   "return_type" : "_ZTIj",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::NativeBridgeInitAnonymousNamespace",
-   "linker_set_key" : "NativeBridgeInitAnonymousNamespace",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    },
-    {
-     "referenced_type" : "_ZTIPKc"
-    }
-   ],
-   "return_type" : "_ZTIb",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
    "function_name" : "android::NativeBridgeInitialized",
    "linker_set_key" : "NativeBridgeInitialized",
    "return_type" : "_ZTIb",
    "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
   },
   {
-   "function_name" : "android::NativeBridgeIsPathSupported",
-   "linker_set_key" : "NativeBridgeIsPathSupported",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    }
-   ],
-   "return_type" : "_ZTIb",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::NativeBridgeIsSupported",
-   "linker_set_key" : "NativeBridgeIsSupported",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    }
-   ],
-   "return_type" : "_ZTIb",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::NativeBridgeLinkNamespaces",
-   "linker_set_key" : "NativeBridgeLinkNamespaces",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPN7android25native_bridge_namespace_tE"
-    },
-    {
-     "referenced_type" : "_ZTIPN7android25native_bridge_namespace_tE"
-    },
-    {
-     "referenced_type" : "_ZTIPKc"
-    }
-   ],
-   "return_type" : "_ZTIb",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::NativeBridgeLoadLibrary",
-   "linker_set_key" : "NativeBridgeLoadLibrary",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIPv",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::NativeBridgeLoadLibraryExt",
-   "linker_set_key" : "NativeBridgeLoadLibraryExt",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPN7android25native_bridge_namespace_tE"
-    }
-   ],
-   "return_type" : "_ZTIPv",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::NativeBridgeNameAcceptable",
-   "linker_set_key" : "NativeBridgeNameAcceptable",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    }
-   ],
-   "return_type" : "_ZTIb",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::NativeBridgeUnloadLibrary",
-   "linker_set_key" : "NativeBridgeUnloadLibrary",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPv"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
    "function_name" : "android::NeedsNativeBridge",
    "linker_set_key" : "NeedsNativeBridge",
    "parameters" :
@@ -5762,18 +5504,6 @@
    ],
    "return_type" : "_ZTIb",
    "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::PreZygoteForkNativeBridge",
-   "linker_set_key" : "PreZygoteForkNativeBridge",
-   "return_type" : "_ZTIv",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::UnloadNativeBridge",
-   "linker_set_key" : "UnloadNativeBridge",
-   "return_type" : "_ZTIv",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
   }
  ],
  "global_vars" : [],
diff --git a/S/64/arm64_armv8-a/source-based/libnativeloader.so.lsdump b/S/64/arm64_armv8-a/source-based/libnativeloader.so.lsdump
index 1009735..5138763 100644
--- a/S/64/arm64_armv8-a/source-based/libnativeloader.so.lsdump
+++ b/S/64/arm64_armv8-a/source-based/libnativeloader.so.lsdump
@@ -220,9 +220,6 @@
    "name" : "FindNativeLoaderNamespaceByClassLoader"
   },
   {
-   "name" : "InitializeNativeLoader"
-  },
-  {
    "name" : "NativeLoaderFreeErrorMessage"
   },
   {
@@ -230,9 +227,6 @@
   },
   {
    "name" : "OpenNativeLibraryInNamespace"
-  },
-  {
-   "name" : "ResetNativeLoader"
   }
  ],
  "elf_objects" : [],
@@ -5300,12 +5294,6 @@
    "source_file" : "art/libnativeloader/include/nativeloader/native_loader.h"
   },
   {
-   "function_name" : "android::InitializeNativeLoader",
-   "linker_set_key" : "InitializeNativeLoader",
-   "return_type" : "_ZTIv",
-   "source_file" : "art/libnativeloader/include/nativeloader/native_loader.h"
-  },
-  {
    "function_name" : "android::NativeLoaderFreeErrorMessage",
    "linker_set_key" : "NativeLoaderFreeErrorMessage",
    "parameters" :
@@ -5370,12 +5358,6 @@
    ],
    "return_type" : "_ZTIPv",
    "source_file" : "art/libnativeloader/include/nativeloader/native_loader.h"
-  },
-  {
-   "function_name" : "android::ResetNativeLoader",
-   "linker_set_key" : "ResetNativeLoader",
-   "return_type" : "_ZTIv",
-   "source_file" : "art/libnativeloader/include/nativeloader/native_loader.h"
   }
  ],
  "global_vars" : [],
diff --git a/S/64/arm_armv7-a-neon/source-based/libnativebridge.so.lsdump b/S/64/arm_armv7-a-neon/source-based/libnativebridge.so.lsdump
index 70238e6..1ec9f55 100644
--- a/S/64/arm_armv7-a-neon/source-based/libnativebridge.so.lsdump
+++ b/S/64/arm_armv7-a-neon/source-based/libnativebridge.so.lsdump
@@ -124,73 +124,22 @@
  "elf_functions" :
  [
   {
-   "name" : "InitializeNativeBridge"
-  },
-  {
-   "name" : "LoadNativeBridge"
-  },
-  {
    "name" : "NativeBridgeAvailable"
   },
   {
-   "name" : "NativeBridgeCreateNamespace"
-  },
-  {
-   "name" : "NativeBridgeError"
-  },
-  {
    "name" : "NativeBridgeGetError"
   },
   {
-   "name" : "NativeBridgeGetExportedNamespace"
-  },
-  {
-   "name" : "NativeBridgeGetSignalHandler"
-  },
-  {
    "name" : "NativeBridgeGetTrampoline"
   },
   {
-   "name" : "NativeBridgeGetVersion"
-  },
-  {
-   "name" : "NativeBridgeInitAnonymousNamespace"
-  },
-  {
    "name" : "NativeBridgeInitialized"
   },
   {
-   "name" : "NativeBridgeIsPathSupported"
-  },
-  {
-   "name" : "NativeBridgeIsSupported"
-  },
-  {
-   "name" : "NativeBridgeLinkNamespaces"
-  },
-  {
-   "name" : "NativeBridgeLoadLibrary"
-  },
-  {
-   "name" : "NativeBridgeLoadLibraryExt"
-  },
-  {
-   "name" : "NativeBridgeNameAcceptable"
-  },
-  {
-   "name" : "NativeBridgeUnloadLibrary"
-  },
-  {
    "name" : "NeedsNativeBridge"
   },
   {
    "name" : "PreInitializeNativeBridge"
-  },
-  {
-   "name" : "PreZygoteForkNativeBridge"
-  },
-  {
-   "name" : "UnloadNativeBridge"
   }
  ],
  "elf_objects" : [],
@@ -5491,105 +5440,18 @@
  "functions" :
  [
   {
-   "function_name" : "android::InitializeNativeBridge",
-   "linker_set_key" : "InitializeNativeBridge",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP7_JNIEnv"
-    },
-    {
-     "referenced_type" : "_ZTIPKc"
-    }
-   ],
-   "return_type" : "_ZTIb",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::LoadNativeBridge",
-   "linker_set_key" : "LoadNativeBridge",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    },
-    {
-     "referenced_type" : "_ZTIPKN7android28NativeBridgeRuntimeCallbacksE"
-    }
-   ],
-   "return_type" : "_ZTIb",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
    "function_name" : "android::NativeBridgeAvailable",
    "linker_set_key" : "NativeBridgeAvailable",
    "return_type" : "_ZTIb",
    "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
   },
   {
-   "function_name" : "android::NativeBridgeCreateNamespace",
-   "linker_set_key" : "NativeBridgeCreateNamespace",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    },
-    {
-     "referenced_type" : "_ZTIPKc"
-    },
-    {
-     "referenced_type" : "_ZTIPKc"
-    },
-    {
-     "referenced_type" : "_ZTIy"
-    },
-    {
-     "referenced_type" : "_ZTIPKc"
-    },
-    {
-     "referenced_type" : "_ZTIPN7android25native_bridge_namespace_tE"
-    }
-   ],
-   "return_type" : "_ZTIPN7android25native_bridge_namespace_tE",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::NativeBridgeError",
-   "linker_set_key" : "NativeBridgeError",
-   "return_type" : "_ZTIb",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
    "function_name" : "android::NativeBridgeGetError",
    "linker_set_key" : "NativeBridgeGetError",
    "return_type" : "_ZTIPKc",
    "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
   },
   {
-   "function_name" : "android::NativeBridgeGetExportedNamespace",
-   "linker_set_key" : "NativeBridgeGetExportedNamespace",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    }
-   ],
-   "return_type" : "_ZTIPN7android25native_bridge_namespace_tE",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::NativeBridgeGetSignalHandler",
-   "linker_set_key" : "NativeBridgeGetSignalHandler",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIPFbiP7siginfoPvE",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
    "function_name" : "android::NativeBridgeGetTrampoline",
    "linker_set_key" : "NativeBridgeGetTrampoline",
    "parameters" :
@@ -5611,132 +5473,12 @@
    "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
   },
   {
-   "function_name" : "android::NativeBridgeGetVersion",
-   "linker_set_key" : "NativeBridgeGetVersion",
-   "return_type" : "_ZTIj",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::NativeBridgeInitAnonymousNamespace",
-   "linker_set_key" : "NativeBridgeInitAnonymousNamespace",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    },
-    {
-     "referenced_type" : "_ZTIPKc"
-    }
-   ],
-   "return_type" : "_ZTIb",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
    "function_name" : "android::NativeBridgeInitialized",
    "linker_set_key" : "NativeBridgeInitialized",
    "return_type" : "_ZTIb",
    "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
   },
   {
-   "function_name" : "android::NativeBridgeIsPathSupported",
-   "linker_set_key" : "NativeBridgeIsPathSupported",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    }
-   ],
-   "return_type" : "_ZTIb",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::NativeBridgeIsSupported",
-   "linker_set_key" : "NativeBridgeIsSupported",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    }
-   ],
-   "return_type" : "_ZTIb",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::NativeBridgeLinkNamespaces",
-   "linker_set_key" : "NativeBridgeLinkNamespaces",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPN7android25native_bridge_namespace_tE"
-    },
-    {
-     "referenced_type" : "_ZTIPN7android25native_bridge_namespace_tE"
-    },
-    {
-     "referenced_type" : "_ZTIPKc"
-    }
-   ],
-   "return_type" : "_ZTIb",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::NativeBridgeLoadLibrary",
-   "linker_set_key" : "NativeBridgeLoadLibrary",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIPv",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::NativeBridgeLoadLibraryExt",
-   "linker_set_key" : "NativeBridgeLoadLibraryExt",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPN7android25native_bridge_namespace_tE"
-    }
-   ],
-   "return_type" : "_ZTIPv",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::NativeBridgeNameAcceptable",
-   "linker_set_key" : "NativeBridgeNameAcceptable",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    }
-   ],
-   "return_type" : "_ZTIb",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::NativeBridgeUnloadLibrary",
-   "linker_set_key" : "NativeBridgeUnloadLibrary",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPv"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
    "function_name" : "android::NeedsNativeBridge",
    "linker_set_key" : "NeedsNativeBridge",
    "parameters" :
@@ -5762,18 +5504,6 @@
    ],
    "return_type" : "_ZTIb",
    "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::PreZygoteForkNativeBridge",
-   "linker_set_key" : "PreZygoteForkNativeBridge",
-   "return_type" : "_ZTIv",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::UnloadNativeBridge",
-   "linker_set_key" : "UnloadNativeBridge",
-   "return_type" : "_ZTIv",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
   }
  ],
  "global_vars" : [],
diff --git a/S/64/arm_armv7-a-neon/source-based/libnativeloader.so.lsdump b/S/64/arm_armv7-a-neon/source-based/libnativeloader.so.lsdump
index 11c3324..eaeda39 100644
--- a/S/64/arm_armv7-a-neon/source-based/libnativeloader.so.lsdump
+++ b/S/64/arm_armv7-a-neon/source-based/libnativeloader.so.lsdump
@@ -201,9 +201,6 @@
    "name" : "FindNativeLoaderNamespaceByClassLoader"
   },
   {
-   "name" : "InitializeNativeLoader"
-  },
-  {
    "name" : "NativeLoaderFreeErrorMessage"
   },
   {
@@ -211,9 +208,6 @@
   },
   {
    "name" : "OpenNativeLibraryInNamespace"
-  },
-  {
-   "name" : "ResetNativeLoader"
   }
  ],
  "elf_objects" : [],
@@ -5281,12 +5275,6 @@
    "source_file" : "art/libnativeloader/include/nativeloader/native_loader.h"
   },
   {
-   "function_name" : "android::InitializeNativeLoader",
-   "linker_set_key" : "InitializeNativeLoader",
-   "return_type" : "_ZTIv",
-   "source_file" : "art/libnativeloader/include/nativeloader/native_loader.h"
-  },
-  {
    "function_name" : "android::NativeLoaderFreeErrorMessage",
    "linker_set_key" : "NativeLoaderFreeErrorMessage",
    "parameters" :
@@ -5351,12 +5339,6 @@
    ],
    "return_type" : "_ZTIPv",
    "source_file" : "art/libnativeloader/include/nativeloader/native_loader.h"
-  },
-  {
-   "function_name" : "android::ResetNativeLoader",
-   "linker_set_key" : "ResetNativeLoader",
-   "return_type" : "_ZTIv",
-   "source_file" : "art/libnativeloader/include/nativeloader/native_loader.h"
   }
  ],
  "global_vars" : [],
diff --git a/S/64/arm_armv8-a/source-based/libnativebridge.so.lsdump b/S/64/arm_armv8-a/source-based/libnativebridge.so.lsdump
index 70238e6..1ec9f55 100644
--- a/S/64/arm_armv8-a/source-based/libnativebridge.so.lsdump
+++ b/S/64/arm_armv8-a/source-based/libnativebridge.so.lsdump
@@ -124,73 +124,22 @@
  "elf_functions" :
  [
   {
-   "name" : "InitializeNativeBridge"
-  },
-  {
-   "name" : "LoadNativeBridge"
-  },
-  {
    "name" : "NativeBridgeAvailable"
   },
   {
-   "name" : "NativeBridgeCreateNamespace"
-  },
-  {
-   "name" : "NativeBridgeError"
-  },
-  {
    "name" : "NativeBridgeGetError"
   },
   {
-   "name" : "NativeBridgeGetExportedNamespace"
-  },
-  {
-   "name" : "NativeBridgeGetSignalHandler"
-  },
-  {
    "name" : "NativeBridgeGetTrampoline"
   },
   {
-   "name" : "NativeBridgeGetVersion"
-  },
-  {
-   "name" : "NativeBridgeInitAnonymousNamespace"
-  },
-  {
    "name" : "NativeBridgeInitialized"
   },
   {
-   "name" : "NativeBridgeIsPathSupported"
-  },
-  {
-   "name" : "NativeBridgeIsSupported"
-  },
-  {
-   "name" : "NativeBridgeLinkNamespaces"
-  },
-  {
-   "name" : "NativeBridgeLoadLibrary"
-  },
-  {
-   "name" : "NativeBridgeLoadLibraryExt"
-  },
-  {
-   "name" : "NativeBridgeNameAcceptable"
-  },
-  {
-   "name" : "NativeBridgeUnloadLibrary"
-  },
-  {
    "name" : "NeedsNativeBridge"
   },
   {
    "name" : "PreInitializeNativeBridge"
-  },
-  {
-   "name" : "PreZygoteForkNativeBridge"
-  },
-  {
-   "name" : "UnloadNativeBridge"
   }
  ],
  "elf_objects" : [],
@@ -5491,105 +5440,18 @@
  "functions" :
  [
   {
-   "function_name" : "android::InitializeNativeBridge",
-   "linker_set_key" : "InitializeNativeBridge",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP7_JNIEnv"
-    },
-    {
-     "referenced_type" : "_ZTIPKc"
-    }
-   ],
-   "return_type" : "_ZTIb",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::LoadNativeBridge",
-   "linker_set_key" : "LoadNativeBridge",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    },
-    {
-     "referenced_type" : "_ZTIPKN7android28NativeBridgeRuntimeCallbacksE"
-    }
-   ],
-   "return_type" : "_ZTIb",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
    "function_name" : "android::NativeBridgeAvailable",
    "linker_set_key" : "NativeBridgeAvailable",
    "return_type" : "_ZTIb",
    "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
   },
   {
-   "function_name" : "android::NativeBridgeCreateNamespace",
-   "linker_set_key" : "NativeBridgeCreateNamespace",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    },
-    {
-     "referenced_type" : "_ZTIPKc"
-    },
-    {
-     "referenced_type" : "_ZTIPKc"
-    },
-    {
-     "referenced_type" : "_ZTIy"
-    },
-    {
-     "referenced_type" : "_ZTIPKc"
-    },
-    {
-     "referenced_type" : "_ZTIPN7android25native_bridge_namespace_tE"
-    }
-   ],
-   "return_type" : "_ZTIPN7android25native_bridge_namespace_tE",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::NativeBridgeError",
-   "linker_set_key" : "NativeBridgeError",
-   "return_type" : "_ZTIb",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
    "function_name" : "android::NativeBridgeGetError",
    "linker_set_key" : "NativeBridgeGetError",
    "return_type" : "_ZTIPKc",
    "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
   },
   {
-   "function_name" : "android::NativeBridgeGetExportedNamespace",
-   "linker_set_key" : "NativeBridgeGetExportedNamespace",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    }
-   ],
-   "return_type" : "_ZTIPN7android25native_bridge_namespace_tE",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::NativeBridgeGetSignalHandler",
-   "linker_set_key" : "NativeBridgeGetSignalHandler",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIPFbiP7siginfoPvE",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
    "function_name" : "android::NativeBridgeGetTrampoline",
    "linker_set_key" : "NativeBridgeGetTrampoline",
    "parameters" :
@@ -5611,132 +5473,12 @@
    "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
   },
   {
-   "function_name" : "android::NativeBridgeGetVersion",
-   "linker_set_key" : "NativeBridgeGetVersion",
-   "return_type" : "_ZTIj",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::NativeBridgeInitAnonymousNamespace",
-   "linker_set_key" : "NativeBridgeInitAnonymousNamespace",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    },
-    {
-     "referenced_type" : "_ZTIPKc"
-    }
-   ],
-   "return_type" : "_ZTIb",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
    "function_name" : "android::NativeBridgeInitialized",
    "linker_set_key" : "NativeBridgeInitialized",
    "return_type" : "_ZTIb",
    "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
   },
   {
-   "function_name" : "android::NativeBridgeIsPathSupported",
-   "linker_set_key" : "NativeBridgeIsPathSupported",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    }
-   ],
-   "return_type" : "_ZTIb",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::NativeBridgeIsSupported",
-   "linker_set_key" : "NativeBridgeIsSupported",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    }
-   ],
-   "return_type" : "_ZTIb",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::NativeBridgeLinkNamespaces",
-   "linker_set_key" : "NativeBridgeLinkNamespaces",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPN7android25native_bridge_namespace_tE"
-    },
-    {
-     "referenced_type" : "_ZTIPN7android25native_bridge_namespace_tE"
-    },
-    {
-     "referenced_type" : "_ZTIPKc"
-    }
-   ],
-   "return_type" : "_ZTIb",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::NativeBridgeLoadLibrary",
-   "linker_set_key" : "NativeBridgeLoadLibrary",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIPv",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::NativeBridgeLoadLibraryExt",
-   "linker_set_key" : "NativeBridgeLoadLibraryExt",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPN7android25native_bridge_namespace_tE"
-    }
-   ],
-   "return_type" : "_ZTIPv",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::NativeBridgeNameAcceptable",
-   "linker_set_key" : "NativeBridgeNameAcceptable",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    }
-   ],
-   "return_type" : "_ZTIb",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::NativeBridgeUnloadLibrary",
-   "linker_set_key" : "NativeBridgeUnloadLibrary",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPv"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
    "function_name" : "android::NeedsNativeBridge",
    "linker_set_key" : "NeedsNativeBridge",
    "parameters" :
@@ -5762,18 +5504,6 @@
    ],
    "return_type" : "_ZTIb",
    "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::PreZygoteForkNativeBridge",
-   "linker_set_key" : "PreZygoteForkNativeBridge",
-   "return_type" : "_ZTIv",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::UnloadNativeBridge",
-   "linker_set_key" : "UnloadNativeBridge",
-   "return_type" : "_ZTIv",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
   }
  ],
  "global_vars" : [],
diff --git a/S/64/arm_armv8-a/source-based/libnativeloader.so.lsdump b/S/64/arm_armv8-a/source-based/libnativeloader.so.lsdump
index 11c3324..eaeda39 100644
--- a/S/64/arm_armv8-a/source-based/libnativeloader.so.lsdump
+++ b/S/64/arm_armv8-a/source-based/libnativeloader.so.lsdump
@@ -201,9 +201,6 @@
    "name" : "FindNativeLoaderNamespaceByClassLoader"
   },
   {
-   "name" : "InitializeNativeLoader"
-  },
-  {
    "name" : "NativeLoaderFreeErrorMessage"
   },
   {
@@ -211,9 +208,6 @@
   },
   {
    "name" : "OpenNativeLibraryInNamespace"
-  },
-  {
-   "name" : "ResetNativeLoader"
   }
  ],
  "elf_objects" : [],
@@ -5281,12 +5275,6 @@
    "source_file" : "art/libnativeloader/include/nativeloader/native_loader.h"
   },
   {
-   "function_name" : "android::InitializeNativeLoader",
-   "linker_set_key" : "InitializeNativeLoader",
-   "return_type" : "_ZTIv",
-   "source_file" : "art/libnativeloader/include/nativeloader/native_loader.h"
-  },
-  {
    "function_name" : "android::NativeLoaderFreeErrorMessage",
    "linker_set_key" : "NativeLoaderFreeErrorMessage",
    "parameters" :
@@ -5351,12 +5339,6 @@
    ],
    "return_type" : "_ZTIPv",
    "source_file" : "art/libnativeloader/include/nativeloader/native_loader.h"
-  },
-  {
-   "function_name" : "android::ResetNativeLoader",
-   "linker_set_key" : "ResetNativeLoader",
-   "return_type" : "_ZTIv",
-   "source_file" : "art/libnativeloader/include/nativeloader/native_loader.h"
   }
  ],
  "global_vars" : [],
diff --git a/S/64/x86/source-based/libnativebridge.so.lsdump b/S/64/x86/source-based/libnativebridge.so.lsdump
index 6e6aade..e4443f1 100644
--- a/S/64/x86/source-based/libnativebridge.so.lsdump
+++ b/S/64/x86/source-based/libnativebridge.so.lsdump
@@ -123,73 +123,22 @@
  "elf_functions" :
  [
   {
-   "name" : "InitializeNativeBridge"
-  },
-  {
-   "name" : "LoadNativeBridge"
-  },
-  {
    "name" : "NativeBridgeAvailable"
   },
   {
-   "name" : "NativeBridgeCreateNamespace"
-  },
-  {
-   "name" : "NativeBridgeError"
-  },
-  {
    "name" : "NativeBridgeGetError"
   },
   {
-   "name" : "NativeBridgeGetExportedNamespace"
-  },
-  {
-   "name" : "NativeBridgeGetSignalHandler"
-  },
-  {
    "name" : "NativeBridgeGetTrampoline"
   },
   {
-   "name" : "NativeBridgeGetVersion"
-  },
-  {
-   "name" : "NativeBridgeInitAnonymousNamespace"
-  },
-  {
    "name" : "NativeBridgeInitialized"
   },
   {
-   "name" : "NativeBridgeIsPathSupported"
-  },
-  {
-   "name" : "NativeBridgeIsSupported"
-  },
-  {
-   "name" : "NativeBridgeLinkNamespaces"
-  },
-  {
-   "name" : "NativeBridgeLoadLibrary"
-  },
-  {
-   "name" : "NativeBridgeLoadLibraryExt"
-  },
-  {
-   "name" : "NativeBridgeNameAcceptable"
-  },
-  {
-   "name" : "NativeBridgeUnloadLibrary"
-  },
-  {
    "name" : "NeedsNativeBridge"
   },
   {
    "name" : "PreInitializeNativeBridge"
-  },
-  {
-   "name" : "PreZygoteForkNativeBridge"
-  },
-  {
-   "name" : "UnloadNativeBridge"
   }
  ],
  "elf_objects" : [],
@@ -5490,105 +5439,18 @@
  "functions" :
  [
   {
-   "function_name" : "android::InitializeNativeBridge",
-   "linker_set_key" : "InitializeNativeBridge",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP7_JNIEnv"
-    },
-    {
-     "referenced_type" : "_ZTIPKc"
-    }
-   ],
-   "return_type" : "_ZTIb",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::LoadNativeBridge",
-   "linker_set_key" : "LoadNativeBridge",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    },
-    {
-     "referenced_type" : "_ZTIPKN7android28NativeBridgeRuntimeCallbacksE"
-    }
-   ],
-   "return_type" : "_ZTIb",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
    "function_name" : "android::NativeBridgeAvailable",
    "linker_set_key" : "NativeBridgeAvailable",
    "return_type" : "_ZTIb",
    "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
   },
   {
-   "function_name" : "android::NativeBridgeCreateNamespace",
-   "linker_set_key" : "NativeBridgeCreateNamespace",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    },
-    {
-     "referenced_type" : "_ZTIPKc"
-    },
-    {
-     "referenced_type" : "_ZTIPKc"
-    },
-    {
-     "referenced_type" : "_ZTIy"
-    },
-    {
-     "referenced_type" : "_ZTIPKc"
-    },
-    {
-     "referenced_type" : "_ZTIPN7android25native_bridge_namespace_tE"
-    }
-   ],
-   "return_type" : "_ZTIPN7android25native_bridge_namespace_tE",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::NativeBridgeError",
-   "linker_set_key" : "NativeBridgeError",
-   "return_type" : "_ZTIb",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
    "function_name" : "android::NativeBridgeGetError",
    "linker_set_key" : "NativeBridgeGetError",
    "return_type" : "_ZTIPKc",
    "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
   },
   {
-   "function_name" : "android::NativeBridgeGetExportedNamespace",
-   "linker_set_key" : "NativeBridgeGetExportedNamespace",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    }
-   ],
-   "return_type" : "_ZTIPN7android25native_bridge_namespace_tE",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::NativeBridgeGetSignalHandler",
-   "linker_set_key" : "NativeBridgeGetSignalHandler",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIPFbiP7siginfoPvE",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
    "function_name" : "android::NativeBridgeGetTrampoline",
    "linker_set_key" : "NativeBridgeGetTrampoline",
    "parameters" :
@@ -5610,132 +5472,12 @@
    "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
   },
   {
-   "function_name" : "android::NativeBridgeGetVersion",
-   "linker_set_key" : "NativeBridgeGetVersion",
-   "return_type" : "_ZTIj",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::NativeBridgeInitAnonymousNamespace",
-   "linker_set_key" : "NativeBridgeInitAnonymousNamespace",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    },
-    {
-     "referenced_type" : "_ZTIPKc"
-    }
-   ],
-   "return_type" : "_ZTIb",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
    "function_name" : "android::NativeBridgeInitialized",
    "linker_set_key" : "NativeBridgeInitialized",
    "return_type" : "_ZTIb",
    "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
   },
   {
-   "function_name" : "android::NativeBridgeIsPathSupported",
-   "linker_set_key" : "NativeBridgeIsPathSupported",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    }
-   ],
-   "return_type" : "_ZTIb",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::NativeBridgeIsSupported",
-   "linker_set_key" : "NativeBridgeIsSupported",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    }
-   ],
-   "return_type" : "_ZTIb",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::NativeBridgeLinkNamespaces",
-   "linker_set_key" : "NativeBridgeLinkNamespaces",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPN7android25native_bridge_namespace_tE"
-    },
-    {
-     "referenced_type" : "_ZTIPN7android25native_bridge_namespace_tE"
-    },
-    {
-     "referenced_type" : "_ZTIPKc"
-    }
-   ],
-   "return_type" : "_ZTIb",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::NativeBridgeLoadLibrary",
-   "linker_set_key" : "NativeBridgeLoadLibrary",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIPv",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::NativeBridgeLoadLibraryExt",
-   "linker_set_key" : "NativeBridgeLoadLibraryExt",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPN7android25native_bridge_namespace_tE"
-    }
-   ],
-   "return_type" : "_ZTIPv",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::NativeBridgeNameAcceptable",
-   "linker_set_key" : "NativeBridgeNameAcceptable",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    }
-   ],
-   "return_type" : "_ZTIb",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::NativeBridgeUnloadLibrary",
-   "linker_set_key" : "NativeBridgeUnloadLibrary",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPv"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
    "function_name" : "android::NeedsNativeBridge",
    "linker_set_key" : "NeedsNativeBridge",
    "parameters" :
@@ -5761,18 +5503,6 @@
    ],
    "return_type" : "_ZTIb",
    "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::PreZygoteForkNativeBridge",
-   "linker_set_key" : "PreZygoteForkNativeBridge",
-   "return_type" : "_ZTIv",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::UnloadNativeBridge",
-   "linker_set_key" : "UnloadNativeBridge",
-   "return_type" : "_ZTIv",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
   }
  ],
  "global_vars" : [],
diff --git a/S/64/x86/source-based/libnativeloader.so.lsdump b/S/64/x86/source-based/libnativeloader.so.lsdump
index 8efc7a9..b88a145 100644
--- a/S/64/x86/source-based/libnativeloader.so.lsdump
+++ b/S/64/x86/source-based/libnativeloader.so.lsdump
@@ -199,9 +199,6 @@
    "name" : "FindNativeLoaderNamespaceByClassLoader"
   },
   {
-   "name" : "InitializeNativeLoader"
-  },
-  {
    "name" : "NativeLoaderFreeErrorMessage"
   },
   {
@@ -209,9 +206,6 @@
   },
   {
    "name" : "OpenNativeLibraryInNamespace"
-  },
-  {
-   "name" : "ResetNativeLoader"
   }
  ],
  "elf_objects" : [],
@@ -5279,12 +5273,6 @@
    "source_file" : "art/libnativeloader/include/nativeloader/native_loader.h"
   },
   {
-   "function_name" : "android::InitializeNativeLoader",
-   "linker_set_key" : "InitializeNativeLoader",
-   "return_type" : "_ZTIv",
-   "source_file" : "art/libnativeloader/include/nativeloader/native_loader.h"
-  },
-  {
    "function_name" : "android::NativeLoaderFreeErrorMessage",
    "linker_set_key" : "NativeLoaderFreeErrorMessage",
    "parameters" :
@@ -5349,12 +5337,6 @@
    ],
    "return_type" : "_ZTIPv",
    "source_file" : "art/libnativeloader/include/nativeloader/native_loader.h"
-  },
-  {
-   "function_name" : "android::ResetNativeLoader",
-   "linker_set_key" : "ResetNativeLoader",
-   "return_type" : "_ZTIv",
-   "source_file" : "art/libnativeloader/include/nativeloader/native_loader.h"
   }
  ],
  "global_vars" : [],
diff --git a/S/64/x86_64/source-based/libnativebridge.so.lsdump b/S/64/x86_64/source-based/libnativebridge.so.lsdump
index 101122a..e9b8708 100644
--- a/S/64/x86_64/source-based/libnativebridge.so.lsdump
+++ b/S/64/x86_64/source-based/libnativebridge.so.lsdump
@@ -123,73 +123,22 @@
  "elf_functions" :
  [
   {
-   "name" : "InitializeNativeBridge"
-  },
-  {
-   "name" : "LoadNativeBridge"
-  },
-  {
    "name" : "NativeBridgeAvailable"
   },
   {
-   "name" : "NativeBridgeCreateNamespace"
-  },
-  {
-   "name" : "NativeBridgeError"
-  },
-  {
    "name" : "NativeBridgeGetError"
   },
   {
-   "name" : "NativeBridgeGetExportedNamespace"
-  },
-  {
-   "name" : "NativeBridgeGetSignalHandler"
-  },
-  {
    "name" : "NativeBridgeGetTrampoline"
   },
   {
-   "name" : "NativeBridgeGetVersion"
-  },
-  {
-   "name" : "NativeBridgeInitAnonymousNamespace"
-  },
-  {
    "name" : "NativeBridgeInitialized"
   },
   {
-   "name" : "NativeBridgeIsPathSupported"
-  },
-  {
-   "name" : "NativeBridgeIsSupported"
-  },
-  {
-   "name" : "NativeBridgeLinkNamespaces"
-  },
-  {
-   "name" : "NativeBridgeLoadLibrary"
-  },
-  {
-   "name" : "NativeBridgeLoadLibraryExt"
-  },
-  {
-   "name" : "NativeBridgeNameAcceptable"
-  },
-  {
-   "name" : "NativeBridgeUnloadLibrary"
-  },
-  {
    "name" : "NeedsNativeBridge"
   },
   {
    "name" : "PreInitializeNativeBridge"
-  },
-  {
-   "name" : "PreZygoteForkNativeBridge"
-  },
-  {
-   "name" : "UnloadNativeBridge"
   }
  ],
  "elf_objects" : [],
@@ -5490,105 +5439,18 @@
  "functions" :
  [
   {
-   "function_name" : "android::InitializeNativeBridge",
-   "linker_set_key" : "InitializeNativeBridge",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP7_JNIEnv"
-    },
-    {
-     "referenced_type" : "_ZTIPKc"
-    }
-   ],
-   "return_type" : "_ZTIb",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::LoadNativeBridge",
-   "linker_set_key" : "LoadNativeBridge",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    },
-    {
-     "referenced_type" : "_ZTIPKN7android28NativeBridgeRuntimeCallbacksE"
-    }
-   ],
-   "return_type" : "_ZTIb",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
    "function_name" : "android::NativeBridgeAvailable",
    "linker_set_key" : "NativeBridgeAvailable",
    "return_type" : "_ZTIb",
    "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
   },
   {
-   "function_name" : "android::NativeBridgeCreateNamespace",
-   "linker_set_key" : "NativeBridgeCreateNamespace",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    },
-    {
-     "referenced_type" : "_ZTIPKc"
-    },
-    {
-     "referenced_type" : "_ZTIPKc"
-    },
-    {
-     "referenced_type" : "_ZTIm"
-    },
-    {
-     "referenced_type" : "_ZTIPKc"
-    },
-    {
-     "referenced_type" : "_ZTIPN7android25native_bridge_namespace_tE"
-    }
-   ],
-   "return_type" : "_ZTIPN7android25native_bridge_namespace_tE",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::NativeBridgeError",
-   "linker_set_key" : "NativeBridgeError",
-   "return_type" : "_ZTIb",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
    "function_name" : "android::NativeBridgeGetError",
    "linker_set_key" : "NativeBridgeGetError",
    "return_type" : "_ZTIPKc",
    "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
   },
   {
-   "function_name" : "android::NativeBridgeGetExportedNamespace",
-   "linker_set_key" : "NativeBridgeGetExportedNamespace",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    }
-   ],
-   "return_type" : "_ZTIPN7android25native_bridge_namespace_tE",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::NativeBridgeGetSignalHandler",
-   "linker_set_key" : "NativeBridgeGetSignalHandler",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIPFbiP7siginfoPvE",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
    "function_name" : "android::NativeBridgeGetTrampoline",
    "linker_set_key" : "NativeBridgeGetTrampoline",
    "parameters" :
@@ -5610,132 +5472,12 @@
    "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
   },
   {
-   "function_name" : "android::NativeBridgeGetVersion",
-   "linker_set_key" : "NativeBridgeGetVersion",
-   "return_type" : "_ZTIj",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::NativeBridgeInitAnonymousNamespace",
-   "linker_set_key" : "NativeBridgeInitAnonymousNamespace",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    },
-    {
-     "referenced_type" : "_ZTIPKc"
-    }
-   ],
-   "return_type" : "_ZTIb",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
    "function_name" : "android::NativeBridgeInitialized",
    "linker_set_key" : "NativeBridgeInitialized",
    "return_type" : "_ZTIb",
    "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
   },
   {
-   "function_name" : "android::NativeBridgeIsPathSupported",
-   "linker_set_key" : "NativeBridgeIsPathSupported",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    }
-   ],
-   "return_type" : "_ZTIb",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::NativeBridgeIsSupported",
-   "linker_set_key" : "NativeBridgeIsSupported",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    }
-   ],
-   "return_type" : "_ZTIb",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::NativeBridgeLinkNamespaces",
-   "linker_set_key" : "NativeBridgeLinkNamespaces",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPN7android25native_bridge_namespace_tE"
-    },
-    {
-     "referenced_type" : "_ZTIPN7android25native_bridge_namespace_tE"
-    },
-    {
-     "referenced_type" : "_ZTIPKc"
-    }
-   ],
-   "return_type" : "_ZTIb",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::NativeBridgeLoadLibrary",
-   "linker_set_key" : "NativeBridgeLoadLibrary",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIPv",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::NativeBridgeLoadLibraryExt",
-   "linker_set_key" : "NativeBridgeLoadLibraryExt",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPN7android25native_bridge_namespace_tE"
-    }
-   ],
-   "return_type" : "_ZTIPv",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::NativeBridgeNameAcceptable",
-   "linker_set_key" : "NativeBridgeNameAcceptable",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    }
-   ],
-   "return_type" : "_ZTIb",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::NativeBridgeUnloadLibrary",
-   "linker_set_key" : "NativeBridgeUnloadLibrary",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPv"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
    "function_name" : "android::NeedsNativeBridge",
    "linker_set_key" : "NeedsNativeBridge",
    "parameters" :
@@ -5761,18 +5503,6 @@
    ],
    "return_type" : "_ZTIb",
    "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::PreZygoteForkNativeBridge",
-   "linker_set_key" : "PreZygoteForkNativeBridge",
-   "return_type" : "_ZTIv",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::UnloadNativeBridge",
-   "linker_set_key" : "UnloadNativeBridge",
-   "return_type" : "_ZTIv",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
   }
  ],
  "global_vars" : [],
diff --git a/S/64/x86_64/source-based/libnativeloader.so.lsdump b/S/64/x86_64/source-based/libnativeloader.so.lsdump
index fd2d7a0..64f3001 100644
--- a/S/64/x86_64/source-based/libnativeloader.so.lsdump
+++ b/S/64/x86_64/source-based/libnativeloader.so.lsdump
@@ -218,9 +218,6 @@
    "name" : "FindNativeLoaderNamespaceByClassLoader"
   },
   {
-   "name" : "InitializeNativeLoader"
-  },
-  {
    "name" : "NativeLoaderFreeErrorMessage"
   },
   {
@@ -228,9 +225,6 @@
   },
   {
    "name" : "OpenNativeLibraryInNamespace"
-  },
-  {
-   "name" : "ResetNativeLoader"
   }
  ],
  "elf_objects" : [],
@@ -5298,12 +5292,6 @@
    "source_file" : "art/libnativeloader/include/nativeloader/native_loader.h"
   },
   {
-   "function_name" : "android::InitializeNativeLoader",
-   "linker_set_key" : "InitializeNativeLoader",
-   "return_type" : "_ZTIv",
-   "source_file" : "art/libnativeloader/include/nativeloader/native_loader.h"
-  },
-  {
    "function_name" : "android::NativeLoaderFreeErrorMessage",
    "linker_set_key" : "NativeLoaderFreeErrorMessage",
    "parameters" :
@@ -5368,12 +5356,6 @@
    ],
    "return_type" : "_ZTIPv",
    "source_file" : "art/libnativeloader/include/nativeloader/native_loader.h"
-  },
-  {
-   "function_name" : "android::ResetNativeLoader",
-   "linker_set_key" : "ResetNativeLoader",
-   "return_type" : "_ZTIv",
-   "source_file" : "art/libnativeloader/include/nativeloader/native_loader.h"
   }
  ],
  "global_vars" : [],
diff --git a/S/64/x86_x86_64/source-based/libnativebridge.so.lsdump b/S/64/x86_x86_64/source-based/libnativebridge.so.lsdump
index 6e6aade..e4443f1 100644
--- a/S/64/x86_x86_64/source-based/libnativebridge.so.lsdump
+++ b/S/64/x86_x86_64/source-based/libnativebridge.so.lsdump
@@ -123,73 +123,22 @@
  "elf_functions" :
  [
   {
-   "name" : "InitializeNativeBridge"
-  },
-  {
-   "name" : "LoadNativeBridge"
-  },
-  {
    "name" : "NativeBridgeAvailable"
   },
   {
-   "name" : "NativeBridgeCreateNamespace"
-  },
-  {
-   "name" : "NativeBridgeError"
-  },
-  {
    "name" : "NativeBridgeGetError"
   },
   {
-   "name" : "NativeBridgeGetExportedNamespace"
-  },
-  {
-   "name" : "NativeBridgeGetSignalHandler"
-  },
-  {
    "name" : "NativeBridgeGetTrampoline"
   },
   {
-   "name" : "NativeBridgeGetVersion"
-  },
-  {
-   "name" : "NativeBridgeInitAnonymousNamespace"
-  },
-  {
    "name" : "NativeBridgeInitialized"
   },
   {
-   "name" : "NativeBridgeIsPathSupported"
-  },
-  {
-   "name" : "NativeBridgeIsSupported"
-  },
-  {
-   "name" : "NativeBridgeLinkNamespaces"
-  },
-  {
-   "name" : "NativeBridgeLoadLibrary"
-  },
-  {
-   "name" : "NativeBridgeLoadLibraryExt"
-  },
-  {
-   "name" : "NativeBridgeNameAcceptable"
-  },
-  {
-   "name" : "NativeBridgeUnloadLibrary"
-  },
-  {
    "name" : "NeedsNativeBridge"
   },
   {
    "name" : "PreInitializeNativeBridge"
-  },
-  {
-   "name" : "PreZygoteForkNativeBridge"
-  },
-  {
-   "name" : "UnloadNativeBridge"
   }
  ],
  "elf_objects" : [],
@@ -5490,105 +5439,18 @@
  "functions" :
  [
   {
-   "function_name" : "android::InitializeNativeBridge",
-   "linker_set_key" : "InitializeNativeBridge",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIP7_JNIEnv"
-    },
-    {
-     "referenced_type" : "_ZTIPKc"
-    }
-   ],
-   "return_type" : "_ZTIb",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::LoadNativeBridge",
-   "linker_set_key" : "LoadNativeBridge",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    },
-    {
-     "referenced_type" : "_ZTIPKN7android28NativeBridgeRuntimeCallbacksE"
-    }
-   ],
-   "return_type" : "_ZTIb",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
    "function_name" : "android::NativeBridgeAvailable",
    "linker_set_key" : "NativeBridgeAvailable",
    "return_type" : "_ZTIb",
    "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
   },
   {
-   "function_name" : "android::NativeBridgeCreateNamespace",
-   "linker_set_key" : "NativeBridgeCreateNamespace",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    },
-    {
-     "referenced_type" : "_ZTIPKc"
-    },
-    {
-     "referenced_type" : "_ZTIPKc"
-    },
-    {
-     "referenced_type" : "_ZTIy"
-    },
-    {
-     "referenced_type" : "_ZTIPKc"
-    },
-    {
-     "referenced_type" : "_ZTIPN7android25native_bridge_namespace_tE"
-    }
-   ],
-   "return_type" : "_ZTIPN7android25native_bridge_namespace_tE",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::NativeBridgeError",
-   "linker_set_key" : "NativeBridgeError",
-   "return_type" : "_ZTIb",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
    "function_name" : "android::NativeBridgeGetError",
    "linker_set_key" : "NativeBridgeGetError",
    "return_type" : "_ZTIPKc",
    "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
   },
   {
-   "function_name" : "android::NativeBridgeGetExportedNamespace",
-   "linker_set_key" : "NativeBridgeGetExportedNamespace",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    }
-   ],
-   "return_type" : "_ZTIPN7android25native_bridge_namespace_tE",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::NativeBridgeGetSignalHandler",
-   "linker_set_key" : "NativeBridgeGetSignalHandler",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIPFbiP7siginfoPvE",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
    "function_name" : "android::NativeBridgeGetTrampoline",
    "linker_set_key" : "NativeBridgeGetTrampoline",
    "parameters" :
@@ -5610,132 +5472,12 @@
    "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
   },
   {
-   "function_name" : "android::NativeBridgeGetVersion",
-   "linker_set_key" : "NativeBridgeGetVersion",
-   "return_type" : "_ZTIj",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::NativeBridgeInitAnonymousNamespace",
-   "linker_set_key" : "NativeBridgeInitAnonymousNamespace",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    },
-    {
-     "referenced_type" : "_ZTIPKc"
-    }
-   ],
-   "return_type" : "_ZTIb",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
    "function_name" : "android::NativeBridgeInitialized",
    "linker_set_key" : "NativeBridgeInitialized",
    "return_type" : "_ZTIb",
    "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
   },
   {
-   "function_name" : "android::NativeBridgeIsPathSupported",
-   "linker_set_key" : "NativeBridgeIsPathSupported",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    }
-   ],
-   "return_type" : "_ZTIb",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::NativeBridgeIsSupported",
-   "linker_set_key" : "NativeBridgeIsSupported",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    }
-   ],
-   "return_type" : "_ZTIb",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::NativeBridgeLinkNamespaces",
-   "linker_set_key" : "NativeBridgeLinkNamespaces",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPN7android25native_bridge_namespace_tE"
-    },
-    {
-     "referenced_type" : "_ZTIPN7android25native_bridge_namespace_tE"
-    },
-    {
-     "referenced_type" : "_ZTIPKc"
-    }
-   ],
-   "return_type" : "_ZTIb",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::NativeBridgeLoadLibrary",
-   "linker_set_key" : "NativeBridgeLoadLibrary",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIPv",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::NativeBridgeLoadLibraryExt",
-   "linker_set_key" : "NativeBridgeLoadLibraryExt",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    },
-    {
-     "referenced_type" : "_ZTIPN7android25native_bridge_namespace_tE"
-    }
-   ],
-   "return_type" : "_ZTIPv",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::NativeBridgeNameAcceptable",
-   "linker_set_key" : "NativeBridgeNameAcceptable",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    }
-   ],
-   "return_type" : "_ZTIb",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::NativeBridgeUnloadLibrary",
-   "linker_set_key" : "NativeBridgeUnloadLibrary",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPv"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
    "function_name" : "android::NeedsNativeBridge",
    "linker_set_key" : "NeedsNativeBridge",
    "parameters" :
@@ -5761,18 +5503,6 @@
    ],
    "return_type" : "_ZTIb",
    "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::PreZygoteForkNativeBridge",
-   "linker_set_key" : "PreZygoteForkNativeBridge",
-   "return_type" : "_ZTIv",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
-  },
-  {
-   "function_name" : "android::UnloadNativeBridge",
-   "linker_set_key" : "UnloadNativeBridge",
-   "return_type" : "_ZTIv",
-   "source_file" : "art/libnativebridge/include/nativebridge/native_bridge.h"
   }
  ],
  "global_vars" : [],
diff --git a/S/64/x86_x86_64/source-based/libnativeloader.so.lsdump b/S/64/x86_x86_64/source-based/libnativeloader.so.lsdump
index 8efc7a9..b88a145 100644
--- a/S/64/x86_x86_64/source-based/libnativeloader.so.lsdump
+++ b/S/64/x86_x86_64/source-based/libnativeloader.so.lsdump
@@ -199,9 +199,6 @@
    "name" : "FindNativeLoaderNamespaceByClassLoader"
   },
   {
-   "name" : "InitializeNativeLoader"
-  },
-  {
    "name" : "NativeLoaderFreeErrorMessage"
   },
   {
@@ -209,9 +206,6 @@
   },
   {
    "name" : "OpenNativeLibraryInNamespace"
-  },
-  {
-   "name" : "ResetNativeLoader"
   }
  ],
  "elf_objects" : [],
@@ -5279,12 +5273,6 @@
    "source_file" : "art/libnativeloader/include/nativeloader/native_loader.h"
   },
   {
-   "function_name" : "android::InitializeNativeLoader",
-   "linker_set_key" : "InitializeNativeLoader",
-   "return_type" : "_ZTIv",
-   "source_file" : "art/libnativeloader/include/nativeloader/native_loader.h"
-  },
-  {
    "function_name" : "android::NativeLoaderFreeErrorMessage",
    "linker_set_key" : "NativeLoaderFreeErrorMessage",
    "parameters" :
@@ -5349,12 +5337,6 @@
    ],
    "return_type" : "_ZTIPv",
    "source_file" : "art/libnativeloader/include/nativeloader/native_loader.h"
-  },
-  {
-   "function_name" : "android::ResetNativeLoader",
-   "linker_set_key" : "ResetNativeLoader",
-   "return_type" : "_ZTIv",
-   "source_file" : "art/libnativeloader/include/nativeloader/native_loader.h"
   }
  ],
  "global_vars" : [],