libbinder_ndk: expose declared services list am: 5acb6e38b3 am: acc44d513f am: 37bb9728c8

Original change: https://android-review.googlesource.com/c/platform/prebuilts/abi-dumps/ndk/+/1596020

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic2b9b638536d09ef32dd0e839138d7edf33580e7

6 files changed, 312 insertions, 24 deletions

diff --git a/S/64/arm64_armv8-a/source-based/libbinder_ndk.so.lsdump b/S/64/arm64_armv8-a/source-based/libbinder_ndk.so.lsdump
index 8e5622e..8303b85 100644
--- a/S/64/arm64_armv8-a/source-based/libbinder_ndk.so.lsdump
+++ b/S/64/arm64_armv8-a/source-based/libbinder_ndk.so.lsdump
@@ -449,6 +449,9 @@
    "name" : "AServiceManager_checkService"
   },
   {
+   "name" : "AServiceManager_forEachDeclaredInstance"
+  },
+  {
    "name" : "AServiceManager_forceLazyServicesPersist"
   },
   {
@@ -534,7 +537,7 @@
     }
    ],
    "linker_set_key" : "_ZTI12$FLAG_ONEWAY",
-   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h:47:1)",
+   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h:45:1)",
    "referenced_type" : "_ZTI12$FLAG_ONEWAY",
    "self_type" : "_ZTI12$FLAG_ONEWAY",
    "size" : 4,
@@ -637,7 +640,7 @@
     }
    ],
    "linker_set_key" : "_ZTI18$EX_BAD_PARCELABLE",
-   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h:66:1)",
+   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h:65:1)",
    "referenced_type" : "_ZTI18$EX_BAD_PARCELABLE",
    "self_type" : "_ZTI18$EX_BAD_PARCELABLE",
    "size" : 4,
@@ -760,7 +763,7 @@
     }
    ],
    "linker_set_key" : "_ZTI22$STATUS_ALREADY_EXISTS",
-   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h:36:1)",
+   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h:35:1)",
    "referenced_type" : "_ZTI22$STATUS_ALREADY_EXISTS",
    "self_type" : "_ZTI22$STATUS_ALREADY_EXISTS",
    "size" : 4,
@@ -781,7 +784,7 @@
     }
    ],
    "linker_set_key" : "_ZTI23$FIRST_CALL_TRANSACTION",
-   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h:59:1)",
+   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h:57:1)",
    "referenced_type" : "_ZTI23$FIRST_CALL_TRANSACTION",
    "self_type" : "_ZTI23$FIRST_CALL_TRANSACTION",
    "size" : 4,
@@ -6124,6 +6127,24 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIFvPKcPvE",
+   "name" : "void (const char *, void *)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    }
+   ],
+   "referenced_type" : "_ZTIFvPKcPvE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvPKcPvE",
+   "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIFvPvE",
    "name" : "void (void *)",
    "parameters" :
@@ -7674,6 +7695,24 @@
    "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
   },
   {
+   "function_name" : "AServiceManager_forEachDeclaredInstance",
+   "linker_set_key" : "AServiceManager_forEachDeclaredInstance",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPFvPKcPvE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
+  },
+  {
    "function_name" : "AServiceManager_forceLazyServicesPersist",
    "linker_set_key" : "AServiceManager_forceLazyServicesPersist",
    "parameters" :
@@ -10331,6 +10370,15 @@
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "_ZTIPFvPKcPvE",
+   "name" : "void (*)(const char *, void *)",
+   "referenced_type" : "_ZTIFvPKcPvE",
+   "self_type" : "_ZTIPFvPKcPvE",
+   "size" : 8,
+   "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "_ZTIPFvPvE",
    "name" : "void (*)(void *)",
    "referenced_type" : "_ZTIFvPvE",
diff --git a/S/64/arm_armv7-a-neon/source-based/libbinder_ndk.so.lsdump b/S/64/arm_armv7-a-neon/source-based/libbinder_ndk.so.lsdump
index aa9f67f..b6ad324 100644
--- a/S/64/arm_armv7-a-neon/source-based/libbinder_ndk.so.lsdump
+++ b/S/64/arm_armv7-a-neon/source-based/libbinder_ndk.so.lsdump
@@ -449,6 +449,9 @@
    "name" : "AServiceManager_checkService"
   },
   {
+   "name" : "AServiceManager_forEachDeclaredInstance"
+  },
+  {
    "name" : "AServiceManager_forceLazyServicesPersist"
   },
   {
@@ -534,7 +537,7 @@
     }
    ],
    "linker_set_key" : "_ZTI12$FLAG_ONEWAY",
-   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h:47:1)",
+   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h:45:1)",
    "referenced_type" : "_ZTI12$FLAG_ONEWAY",
    "self_type" : "_ZTI12$FLAG_ONEWAY",
    "size" : 4,
@@ -637,7 +640,7 @@
     }
    ],
    "linker_set_key" : "_ZTI18$EX_BAD_PARCELABLE",
-   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h:66:1)",
+   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h:65:1)",
    "referenced_type" : "_ZTI18$EX_BAD_PARCELABLE",
    "self_type" : "_ZTI18$EX_BAD_PARCELABLE",
    "size" : 4,
@@ -760,7 +763,7 @@
     }
    ],
    "linker_set_key" : "_ZTI22$STATUS_ALREADY_EXISTS",
-   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h:36:1)",
+   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h:35:1)",
    "referenced_type" : "_ZTI22$STATUS_ALREADY_EXISTS",
    "self_type" : "_ZTI22$STATUS_ALREADY_EXISTS",
    "size" : 4,
@@ -781,7 +784,7 @@
     }
    ],
    "linker_set_key" : "_ZTI23$FIRST_CALL_TRANSACTION",
-   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h:59:1)",
+   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h:57:1)",
    "referenced_type" : "_ZTI23$FIRST_CALL_TRANSACTION",
    "self_type" : "_ZTI23$FIRST_CALL_TRANSACTION",
    "size" : 4,
@@ -5848,6 +5851,24 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIFvPKcPvE",
+   "name" : "void (const char *, void *)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    }
+   ],
+   "referenced_type" : "_ZTIFvPKcPvE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvPKcPvE",
+   "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIFvPvE",
    "name" : "void (void *)",
    "parameters" :
@@ -7674,6 +7695,24 @@
    "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
   },
   {
+   "function_name" : "AServiceManager_forEachDeclaredInstance",
+   "linker_set_key" : "AServiceManager_forEachDeclaredInstance",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPFvPKcPvE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
+  },
+  {
    "function_name" : "AServiceManager_forceLazyServicesPersist",
    "linker_set_key" : "AServiceManager_forceLazyServicesPersist",
    "parameters" :
@@ -10223,6 +10262,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIPFvPKcPvE",
+   "name" : "void (*)(const char *, void *)",
+   "referenced_type" : "_ZTIFvPKcPvE",
+   "self_type" : "_ZTIPFvPKcPvE",
+   "size" : 4,
+   "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIPFvPvE",
    "name" : "void (*)(void *)",
    "referenced_type" : "_ZTIFvPvE",
diff --git a/S/64/arm_armv8-a/source-based/libbinder_ndk.so.lsdump b/S/64/arm_armv8-a/source-based/libbinder_ndk.so.lsdump
index aa9f67f..b6ad324 100644
--- a/S/64/arm_armv8-a/source-based/libbinder_ndk.so.lsdump
+++ b/S/64/arm_armv8-a/source-based/libbinder_ndk.so.lsdump
@@ -449,6 +449,9 @@
    "name" : "AServiceManager_checkService"
   },
   {
+   "name" : "AServiceManager_forEachDeclaredInstance"
+  },
+  {
    "name" : "AServiceManager_forceLazyServicesPersist"
   },
   {
@@ -534,7 +537,7 @@
     }
    ],
    "linker_set_key" : "_ZTI12$FLAG_ONEWAY",
-   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h:47:1)",
+   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h:45:1)",
    "referenced_type" : "_ZTI12$FLAG_ONEWAY",
    "self_type" : "_ZTI12$FLAG_ONEWAY",
    "size" : 4,
@@ -637,7 +640,7 @@
     }
    ],
    "linker_set_key" : "_ZTI18$EX_BAD_PARCELABLE",
-   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h:66:1)",
+   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h:65:1)",
    "referenced_type" : "_ZTI18$EX_BAD_PARCELABLE",
    "self_type" : "_ZTI18$EX_BAD_PARCELABLE",
    "size" : 4,
@@ -760,7 +763,7 @@
     }
    ],
    "linker_set_key" : "_ZTI22$STATUS_ALREADY_EXISTS",
-   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h:36:1)",
+   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h:35:1)",
    "referenced_type" : "_ZTI22$STATUS_ALREADY_EXISTS",
    "self_type" : "_ZTI22$STATUS_ALREADY_EXISTS",
    "size" : 4,
@@ -781,7 +784,7 @@
     }
    ],
    "linker_set_key" : "_ZTI23$FIRST_CALL_TRANSACTION",
-   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h:59:1)",
+   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h:57:1)",
    "referenced_type" : "_ZTI23$FIRST_CALL_TRANSACTION",
    "self_type" : "_ZTI23$FIRST_CALL_TRANSACTION",
    "size" : 4,
@@ -5848,6 +5851,24 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIFvPKcPvE",
+   "name" : "void (const char *, void *)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    }
+   ],
+   "referenced_type" : "_ZTIFvPKcPvE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvPKcPvE",
+   "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIFvPvE",
    "name" : "void (void *)",
    "parameters" :
@@ -7674,6 +7695,24 @@
    "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
   },
   {
+   "function_name" : "AServiceManager_forEachDeclaredInstance",
+   "linker_set_key" : "AServiceManager_forEachDeclaredInstance",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPFvPKcPvE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
+  },
+  {
    "function_name" : "AServiceManager_forceLazyServicesPersist",
    "linker_set_key" : "AServiceManager_forceLazyServicesPersist",
    "parameters" :
@@ -10223,6 +10262,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIPFvPKcPvE",
+   "name" : "void (*)(const char *, void *)",
+   "referenced_type" : "_ZTIFvPKcPvE",
+   "self_type" : "_ZTIPFvPKcPvE",
+   "size" : 4,
+   "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIPFvPvE",
    "name" : "void (*)(void *)",
    "referenced_type" : "_ZTIFvPvE",
diff --git a/S/64/x86/source-based/libbinder_ndk.so.lsdump b/S/64/x86/source-based/libbinder_ndk.so.lsdump
index 41c9c78..649fac8 100644
--- a/S/64/x86/source-based/libbinder_ndk.so.lsdump
+++ b/S/64/x86/source-based/libbinder_ndk.so.lsdump
@@ -448,6 +448,9 @@
    "name" : "AServiceManager_checkService"
   },
   {
+   "name" : "AServiceManager_forEachDeclaredInstance"
+  },
+  {
    "name" : "AServiceManager_forceLazyServicesPersist"
   },
   {
@@ -533,7 +536,7 @@
     }
    ],
    "linker_set_key" : "_ZTI12$FLAG_ONEWAY",
-   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h:47:1)",
+   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h:45:1)",
    "referenced_type" : "_ZTI12$FLAG_ONEWAY",
    "self_type" : "_ZTI12$FLAG_ONEWAY",
    "size" : 4,
@@ -636,7 +639,7 @@
     }
    ],
    "linker_set_key" : "_ZTI18$EX_BAD_PARCELABLE",
-   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h:66:1)",
+   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h:65:1)",
    "referenced_type" : "_ZTI18$EX_BAD_PARCELABLE",
    "self_type" : "_ZTI18$EX_BAD_PARCELABLE",
    "size" : 4,
@@ -759,7 +762,7 @@
     }
    ],
    "linker_set_key" : "_ZTI22$STATUS_ALREADY_EXISTS",
-   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h:36:1)",
+   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h:35:1)",
    "referenced_type" : "_ZTI22$STATUS_ALREADY_EXISTS",
    "self_type" : "_ZTI22$STATUS_ALREADY_EXISTS",
    "size" : 4,
@@ -780,7 +783,7 @@
     }
    ],
    "linker_set_key" : "_ZTI23$FIRST_CALL_TRANSACTION",
-   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h:59:1)",
+   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h:57:1)",
    "referenced_type" : "_ZTI23$FIRST_CALL_TRANSACTION",
    "self_type" : "_ZTI23$FIRST_CALL_TRANSACTION",
    "size" : 4,
@@ -5847,6 +5850,24 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIFvPKcPvE",
+   "name" : "void (const char *, void *)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    }
+   ],
+   "referenced_type" : "_ZTIFvPKcPvE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvPKcPvE",
+   "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIFvPvE",
    "name" : "void (void *)",
    "parameters" :
@@ -7673,6 +7694,24 @@
    "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
   },
   {
+   "function_name" : "AServiceManager_forEachDeclaredInstance",
+   "linker_set_key" : "AServiceManager_forEachDeclaredInstance",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPFvPKcPvE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
+  },
+  {
    "function_name" : "AServiceManager_forceLazyServicesPersist",
    "linker_set_key" : "AServiceManager_forceLazyServicesPersist",
    "parameters" :
@@ -10222,6 +10261,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIPFvPKcPvE",
+   "name" : "void (*)(const char *, void *)",
+   "referenced_type" : "_ZTIFvPKcPvE",
+   "self_type" : "_ZTIPFvPKcPvE",
+   "size" : 4,
+   "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIPFvPvE",
    "name" : "void (*)(void *)",
    "referenced_type" : "_ZTIFvPvE",
diff --git a/S/64/x86_64/source-based/libbinder_ndk.so.lsdump b/S/64/x86_64/source-based/libbinder_ndk.so.lsdump
index ba67348..a66a4af 100644
--- a/S/64/x86_64/source-based/libbinder_ndk.so.lsdump
+++ b/S/64/x86_64/source-based/libbinder_ndk.so.lsdump
@@ -448,6 +448,9 @@
    "name" : "AServiceManager_checkService"
   },
   {
+   "name" : "AServiceManager_forEachDeclaredInstance"
+  },
+  {
    "name" : "AServiceManager_forceLazyServicesPersist"
   },
   {
@@ -533,7 +536,7 @@
     }
    ],
    "linker_set_key" : "_ZTI12$FLAG_ONEWAY",
-   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h:47:1)",
+   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h:45:1)",
    "referenced_type" : "_ZTI12$FLAG_ONEWAY",
    "self_type" : "_ZTI12$FLAG_ONEWAY",
    "size" : 4,
@@ -636,7 +639,7 @@
     }
    ],
    "linker_set_key" : "_ZTI18$EX_BAD_PARCELABLE",
-   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h:66:1)",
+   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h:65:1)",
    "referenced_type" : "_ZTI18$EX_BAD_PARCELABLE",
    "self_type" : "_ZTI18$EX_BAD_PARCELABLE",
    "size" : 4,
@@ -759,7 +762,7 @@
     }
    ],
    "linker_set_key" : "_ZTI22$STATUS_ALREADY_EXISTS",
-   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h:36:1)",
+   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h:35:1)",
    "referenced_type" : "_ZTI22$STATUS_ALREADY_EXISTS",
    "self_type" : "_ZTI22$STATUS_ALREADY_EXISTS",
    "size" : 4,
@@ -780,7 +783,7 @@
     }
    ],
    "linker_set_key" : "_ZTI23$FIRST_CALL_TRANSACTION",
-   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h:59:1)",
+   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h:57:1)",
    "referenced_type" : "_ZTI23$FIRST_CALL_TRANSACTION",
    "self_type" : "_ZTI23$FIRST_CALL_TRANSACTION",
    "size" : 4,
@@ -6123,6 +6126,24 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIFvPKcPvE",
+   "name" : "void (const char *, void *)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    }
+   ],
+   "referenced_type" : "_ZTIFvPKcPvE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvPKcPvE",
+   "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIFvPvE",
    "name" : "void (void *)",
    "parameters" :
@@ -7673,6 +7694,24 @@
    "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
   },
   {
+   "function_name" : "AServiceManager_forEachDeclaredInstance",
+   "linker_set_key" : "AServiceManager_forEachDeclaredInstance",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPFvPKcPvE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
+  },
+  {
    "function_name" : "AServiceManager_forceLazyServicesPersist",
    "linker_set_key" : "AServiceManager_forceLazyServicesPersist",
    "parameters" :
@@ -10339,6 +10378,15 @@
   },
   {
    "alignment" : 8,
+   "linker_set_key" : "_ZTIPFvPKcPvE",
+   "name" : "void (*)(const char *, void *)",
+   "referenced_type" : "_ZTIFvPKcPvE",
+   "self_type" : "_ZTIPFvPKcPvE",
+   "size" : 8,
+   "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
+  },
+  {
+   "alignment" : 8,
    "linker_set_key" : "_ZTIPFvPvE",
    "name" : "void (*)(void *)",
    "referenced_type" : "_ZTIFvPvE",
diff --git a/S/64/x86_x86_64/source-based/libbinder_ndk.so.lsdump b/S/64/x86_x86_64/source-based/libbinder_ndk.so.lsdump
index 41c9c78..649fac8 100644
--- a/S/64/x86_x86_64/source-based/libbinder_ndk.so.lsdump
+++ b/S/64/x86_x86_64/source-based/libbinder_ndk.so.lsdump
@@ -448,6 +448,9 @@
    "name" : "AServiceManager_checkService"
   },
   {
+   "name" : "AServiceManager_forEachDeclaredInstance"
+  },
+  {
    "name" : "AServiceManager_forceLazyServicesPersist"
   },
   {
@@ -533,7 +536,7 @@
     }
    ],
    "linker_set_key" : "_ZTI12$FLAG_ONEWAY",
-   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h:47:1)",
+   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h:45:1)",
    "referenced_type" : "_ZTI12$FLAG_ONEWAY",
    "self_type" : "_ZTI12$FLAG_ONEWAY",
    "size" : 4,
@@ -636,7 +639,7 @@
     }
    ],
    "linker_set_key" : "_ZTI18$EX_BAD_PARCELABLE",
-   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h:66:1)",
+   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h:65:1)",
    "referenced_type" : "_ZTI18$EX_BAD_PARCELABLE",
    "self_type" : "_ZTI18$EX_BAD_PARCELABLE",
    "size" : 4,
@@ -759,7 +762,7 @@
     }
    ],
    "linker_set_key" : "_ZTI22$STATUS_ALREADY_EXISTS",
-   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h:36:1)",
+   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_status.h:35:1)",
    "referenced_type" : "_ZTI22$STATUS_ALREADY_EXISTS",
    "self_type" : "_ZTI22$STATUS_ALREADY_EXISTS",
    "size" : 4,
@@ -780,7 +783,7 @@
     }
    ],
    "linker_set_key" : "_ZTI23$FIRST_CALL_TRANSACTION",
-   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h:59:1)",
+   "name" : "(anonymous enum at frameworks/native/libs/binder/ndk/include_ndk/android/binder_ibinder.h:57:1)",
    "referenced_type" : "_ZTI23$FIRST_CALL_TRANSACTION",
    "self_type" : "_ZTI23$FIRST_CALL_TRANSACTION",
    "size" : 4,
@@ -5847,6 +5850,24 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIFvPKcPvE",
+   "name" : "void (const char *, void *)",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    }
+   ],
+   "referenced_type" : "_ZTIFvPKcPvE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvPKcPvE",
+   "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIFvPvE",
    "name" : "void (void *)",
    "parameters" :
@@ -7673,6 +7694,24 @@
    "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
   },
   {
+   "function_name" : "AServiceManager_forEachDeclaredInstance",
+   "linker_set_key" : "AServiceManager_forEachDeclaredInstance",
+   "parameters" :
+   [
+    {
+     "referenced_type" : "_ZTIPKc"
+    },
+    {
+     "referenced_type" : "_ZTIPv"
+    },
+    {
+     "referenced_type" : "_ZTIPFvPKcPvE"
+    }
+   ],
+   "return_type" : "_ZTIv",
+   "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
+  },
+  {
    "function_name" : "AServiceManager_forceLazyServicesPersist",
    "linker_set_key" : "AServiceManager_forceLazyServicesPersist",
    "parameters" :
@@ -10222,6 +10261,15 @@
   },
   {
    "alignment" : 4,
+   "linker_set_key" : "_ZTIPFvPKcPvE",
+   "name" : "void (*)(const char *, void *)",
+   "referenced_type" : "_ZTIFvPKcPvE",
+   "self_type" : "_ZTIPFvPKcPvE",
+   "size" : 4,
+   "source_file" : "frameworks/native/libs/binder/ndk/include_platform/android/binder_manager.h"
+  },
+  {
+   "alignment" : 4,
    "linker_set_key" : "_ZTIPFvPvE",
    "name" : "void (*)(void *)",
    "referenced_type" : "_ZTIFvPvE",