1 files changed, 118 insertions, 118 deletions

diff --git a/R/64/x86/source-based/libnetd_resolv.so.lsdump b/R/64/x86/source-based/libnetd_resolv.so.lsdump
index b3b348a..0a6d6f1 100644
--- a/R/64/x86/source-based/libnetd_resolv.so.lsdump
+++ b/R/64/x86/source-based/libnetd_resolv.so.lsdump
@@ -8,16 +8,16 @@
    "is_unsigned" : true,
    "linker_set_key" : "_ZTIDi",
    "name" : "char32_t",
-   "referenced_type" : "type-48",
-   "self_type" : "type-48",
+   "referenced_type" : "_ZTIDi",
+   "self_type" : "_ZTIDi",
    "size" : 4
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIDn",
    "name" : "nullptr_t",
-   "referenced_type" : "type-184",
-   "self_type" : "type-184",
+   "referenced_type" : "_ZTIDn",
+   "self_type" : "_ZTIDn",
    "size" : 4
   },
   {
@@ -26,8 +26,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "_ZTIDs",
    "name" : "char16_t",
-   "referenced_type" : "type-47",
-   "self_type" : "type-47",
+   "referenced_type" : "_ZTIDs",
+   "self_type" : "_ZTIDs",
    "size" : 2
   },
   {
@@ -35,8 +35,8 @@
    "is_integral" : true,
    "linker_set_key" : "_ZTIa",
    "name" : "signed char",
-   "referenced_type" : "type-49",
-   "self_type" : "type-49",
+   "referenced_type" : "_ZTIa",
+   "self_type" : "_ZTIa",
    "size" : 1
   },
   {
@@ -45,8 +45,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "_ZTIb",
    "name" : "bool",
-   "referenced_type" : "type-33",
-   "self_type" : "type-33",
+   "referenced_type" : "_ZTIb",
+   "self_type" : "_ZTIb",
    "size" : 1
   },
   {
@@ -54,32 +54,32 @@
    "is_integral" : true,
    "linker_set_key" : "_ZTIc",
    "name" : "char",
-   "referenced_type" : "type-6",
-   "self_type" : "type-6",
+   "referenced_type" : "_ZTIc",
+   "self_type" : "_ZTIc",
    "size" : 1
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTId",
    "name" : "double",
-   "referenced_type" : "type-30",
-   "self_type" : "type-30",
+   "referenced_type" : "_ZTId",
+   "self_type" : "_ZTId",
    "size" : 8
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIe",
    "name" : "long double",
-   "referenced_type" : "type-44",
-   "self_type" : "type-44",
+   "referenced_type" : "_ZTIe",
+   "self_type" : "_ZTIe",
    "size" : 8
   },
   {
    "alignment" : 4,
    "linker_set_key" : "_ZTIf",
    "name" : "float",
-   "referenced_type" : "type-31",
-   "self_type" : "type-31",
+   "referenced_type" : "_ZTIf",
+   "self_type" : "_ZTIf",
    "size" : 4
   },
   {
@@ -88,8 +88,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "_ZTIh",
    "name" : "unsigned char",
-   "referenced_type" : "type-45",
-   "self_type" : "type-45",
+   "referenced_type" : "_ZTIh",
+   "self_type" : "_ZTIh",
    "size" : 1
   },
   {
@@ -97,8 +97,8 @@
    "is_integral" : true,
    "linker_set_key" : "_ZTIi",
    "name" : "int",
-   "referenced_type" : "type-3",
-   "self_type" : "type-3",
+   "referenced_type" : "_ZTIi",
+   "self_type" : "_ZTIi",
    "size" : 4
   },
   {
@@ -107,8 +107,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "_ZTIj",
    "name" : "unsigned int",
-   "referenced_type" : "type-2",
-   "self_type" : "type-2",
+   "referenced_type" : "_ZTIj",
+   "self_type" : "_ZTIj",
    "size" : 4
   },
   {
@@ -116,8 +116,8 @@
    "is_integral" : true,
    "linker_set_key" : "_ZTIl",
    "name" : "long",
-   "referenced_type" : "type-41",
-   "self_type" : "type-41",
+   "referenced_type" : "_ZTIl",
+   "self_type" : "_ZTIl",
    "size" : 4
   },
   {
@@ -126,8 +126,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "_ZTIm",
    "name" : "unsigned long",
-   "referenced_type" : "type-42",
-   "self_type" : "type-42",
+   "referenced_type" : "_ZTIm",
+   "self_type" : "_ZTIm",
    "size" : 4
   },
   {
@@ -135,8 +135,8 @@
    "is_integral" : true,
    "linker_set_key" : "_ZTIs",
    "name" : "short",
-   "referenced_type" : "type-46",
-   "self_type" : "type-46",
+   "referenced_type" : "_ZTIs",
+   "self_type" : "_ZTIs",
    "size" : 2
   },
   {
@@ -145,23 +145,23 @@
    "is_unsigned" : true,
    "linker_set_key" : "_ZTIt",
    "name" : "unsigned short",
-   "referenced_type" : "type-50",
-   "self_type" : "type-50",
+   "referenced_type" : "_ZTIt",
+   "self_type" : "_ZTIt",
    "size" : 2
   },
   {
    "linker_set_key" : "_ZTIv",
    "name" : "void",
-   "referenced_type" : "type-29",
-   "self_type" : "type-29"
+   "referenced_type" : "_ZTIv",
+   "self_type" : "_ZTIv"
   },
   {
    "alignment" : 4,
    "is_integral" : true,
    "linker_set_key" : "_ZTIw",
    "name" : "wchar_t",
-   "referenced_type" : "type-43",
-   "self_type" : "type-43",
+   "referenced_type" : "_ZTIw",
+   "self_type" : "_ZTIw",
    "size" : 4
   },
   {
@@ -169,8 +169,8 @@
    "is_integral" : true,
    "linker_set_key" : "_ZTIx",
    "name" : "long long",
-   "referenced_type" : "type-27",
-   "self_type" : "type-27",
+   "referenced_type" : "_ZTIx",
+   "self_type" : "_ZTIx",
    "size" : 8
   },
   {
@@ -179,8 +179,8 @@
    "is_unsigned" : true,
    "linker_set_key" : "_ZTIy",
    "name" : "unsigned long long",
-   "referenced_type" : "type-28",
-   "self_type" : "type-28",
+   "referenced_type" : "_ZTIy",
+   "self_type" : "_ZTIy",
    "size" : 8
   }
  ],
@@ -207,12 +207,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "referenced_type" : "type-14",
-   "return_type" : "type-15",
-   "self_type" : "type-14",
+   "referenced_type" : "_ZTIFbPKcE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbPKcE",
    "source_file" : "/packages/modules/DnsResolver/include/netd_resolv/resolv.h"
   },
   {
@@ -222,15 +222,15 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-24"
+     "referenced_type" : "_ZTIRK19android_net_context"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "referenced_type" : "type-22",
-   "return_type" : "type-23",
-   "self_type" : "type-22",
+   "referenced_type" : "_ZTIFbRK19android_net_contextPKcE",
+   "return_type" : "_ZTIb",
+   "self_type" : "_ZTIFbRK19android_net_contextPKcE",
    "source_file" : "/packages/modules/DnsResolver/include/netd_resolv/resolv.h"
   },
   {
@@ -240,21 +240,21 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-3"
+     "referenced_type" : "_ZTIi"
     },
     {
-     "referenced_type" : "type-2"
+     "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "type-2"
+     "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "type-3"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "referenced_type" : "type-10",
-   "return_type" : "type-3",
-   "self_type" : "type-10",
+   "referenced_type" : "_ZTIFiijjiE",
+   "return_type" : "_ZTIi",
+   "self_type" : "_ZTIFiijjiE",
    "source_file" : "/packages/modules/DnsResolver/include/netd_resolv/resolv.h"
   },
   {
@@ -264,12 +264,12 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIPKc"
     }
    ],
-   "referenced_type" : "type-8",
-   "return_type" : "type-9",
-   "self_type" : "type-8",
+   "referenced_type" : "_ZTIFvPKcE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvPKcE",
    "source_file" : "/packages/modules/DnsResolver/include/netd_resolv/resolv.h"
   },
   {
@@ -279,18 +279,18 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2"
+     "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "type-2"
+     "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "type-19"
+     "referenced_type" : "_ZTIP19android_net_context"
     }
    ],
-   "referenced_type" : "type-17",
-   "return_type" : "type-18",
-   "self_type" : "type-17",
+   "referenced_type" : "_ZTIFvjjP19android_net_contextE",
+   "return_type" : "_ZTIv",
+   "self_type" : "_ZTIFvjjP19android_net_contextE",
    "source_file" : "/packages/modules/DnsResolver/include/netd_resolv/resolv.h"
   }
  ],
@@ -302,22 +302,22 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2"
+     "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "type-32"
+     "referenced_type" : "_ZTIPc"
     },
     {
-     "referenced_type" : "type-2"
+     "referenced_type" : "_ZTIj"
     },
     {
-     "referenced_type" : "type-4"
+     "referenced_type" : "_ZTIPKc"
     },
     {
-     "referenced_type" : "type-3"
+     "referenced_type" : "_ZTIi"
     }
    ],
-   "return_type" : "type-33",
+   "return_type" : "_ZTIb",
    "source_file" : "/packages/modules/DnsResolver/include/netd_resolv/resolv.h"
   },
   {
@@ -326,10 +326,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-2"
+     "referenced_type" : "_ZTIj"
     }
    ],
-   "return_type" : "type-33",
+   "return_type" : "_ZTIb",
    "source_file" : "/packages/modules/DnsResolver/include/netd_resolv/resolv.h"
   },
   {
@@ -338,10 +338,10 @@
    "parameters" :
    [
     {
-     "referenced_type" : "type-26"
+     "referenced_type" : "_ZTIPK21ResolverNetdCallbacks"
     }
    ],
-   "return_type" : "type-33",
+   "return_type" : "_ZTIb",
    "source_file" : "/packages/modules/DnsResolver/include/netd_resolv/resolv.h"
   }
  ],
@@ -352,8 +352,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIRK19android_net_context",
    "name" : "const android_net_context &",
-   "referenced_type" : "type-25",
-   "self_type" : "type-24",
+   "referenced_type" : "_ZTIK19android_net_context",
+   "self_type" : "_ZTIRK19android_net_context",
    "size" : 4,
    "source_file" : "/packages/modules/DnsResolver/include/netd_resolv/resolv.h"
   }
@@ -364,8 +364,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIP19android_net_context",
    "name" : "android_net_context *",
-   "referenced_type" : "type-1",
-   "self_type" : "type-19",
+   "referenced_type" : "_ZTI19android_net_context",
+   "self_type" : "_ZTIP19android_net_context",
    "size" : 4,
    "source_file" : "/packages/modules/DnsResolver/include/netd_resolv/resolv.h"
   },
@@ -373,8 +373,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFbPKcE",
    "name" : "bool (*)(const char *)",
-   "referenced_type" : "type-14",
-   "self_type" : "type-13",
+   "referenced_type" : "_ZTIFbPKcE",
+   "self_type" : "_ZTIPFbPKcE",
    "size" : 4,
    "source_file" : "/packages/modules/DnsResolver/include/netd_resolv/resolv.h"
   },
@@ -382,8 +382,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFbRK19android_net_contextPKcE",
    "name" : "bool (*)(const android_net_context &, const char *)",
-   "referenced_type" : "type-22",
-   "self_type" : "type-21",
+   "referenced_type" : "_ZTIFbRK19android_net_contextPKcE",
+   "self_type" : "_ZTIPFbRK19android_net_contextPKcE",
    "size" : 4,
    "source_file" : "/packages/modules/DnsResolver/include/netd_resolv/resolv.h"
   },
@@ -391,8 +391,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFiijjiE",
    "name" : "int (*)(int, unsigned int, unsigned int, int)",
-   "referenced_type" : "type-10",
-   "self_type" : "type-20",
+   "referenced_type" : "_ZTIFiijjiE",
+   "self_type" : "_ZTIPFiijjiE",
    "size" : 4,
    "source_file" : "/packages/modules/DnsResolver/include/netd_resolv/resolv.h"
   },
@@ -400,8 +400,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvPKcE",
    "name" : "void (*)(const char *)",
-   "referenced_type" : "type-8",
-   "self_type" : "type-7",
+   "referenced_type" : "_ZTIFvPKcE",
+   "self_type" : "_ZTIPFvPKcE",
    "size" : 4,
    "source_file" : "/packages/modules/DnsResolver/include/netd_resolv/resolv.h"
   },
@@ -409,8 +409,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPFvjjP19android_net_contextE",
    "name" : "void (*)(unsigned int, unsigned int, android_net_context *)",
-   "referenced_type" : "type-17",
-   "self_type" : "type-16",
+   "referenced_type" : "_ZTIFvjjP19android_net_contextE",
+   "self_type" : "_ZTIPFvjjP19android_net_contextE",
    "size" : 4,
    "source_file" : "/packages/modules/DnsResolver/include/netd_resolv/resolv.h"
   },
@@ -418,8 +418,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPK21ResolverNetdCallbacks",
    "name" : "const ResolverNetdCallbacks *",
-   "referenced_type" : "type-11",
-   "self_type" : "type-26",
+   "referenced_type" : "_ZTIK21ResolverNetdCallbacks",
+   "self_type" : "_ZTIPK21ResolverNetdCallbacks",
    "size" : 4,
    "source_file" : "/packages/modules/DnsResolver/include/netd_resolv/resolv.h"
   },
@@ -427,8 +427,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPKc",
    "name" : "const char *",
-   "referenced_type" : "type-5",
-   "self_type" : "type-4",
+   "referenced_type" : "_ZTIKc",
+   "self_type" : "_ZTIPKc",
    "size" : 4,
    "source_file" : "/packages/modules/DnsResolver/include/netd_resolv/resolv.h"
   },
@@ -436,8 +436,8 @@
    "alignment" : 4,
    "linker_set_key" : "_ZTIPc",
    "name" : "char *",
-   "referenced_type" : "type-6",
-   "self_type" : "type-32",
+   "referenced_type" : "_ZTIc",
+   "self_type" : "_ZTIPc",
    "size" : 4,
    "source_file" : "/packages/modules/DnsResolver/include/netd_resolv/resolv.h"
   }
@@ -449,8 +449,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIK19android_net_context",
    "name" : "const android_net_context",
-   "referenced_type" : "type-1",
-   "self_type" : "type-25",
+   "referenced_type" : "_ZTI19android_net_context",
+   "self_type" : "_ZTIK19android_net_context",
    "size" : 28,
    "source_file" : "/packages/modules/DnsResolver/include/netd_resolv/resolv.h"
   },
@@ -459,8 +459,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIK21ResolverNetdCallbacks",
    "name" : "const ResolverNetdCallbacks",
-   "referenced_type" : "type-12",
-   "self_type" : "type-11",
+   "referenced_type" : "_ZTI21ResolverNetdCallbacks",
+   "self_type" : "_ZTIK21ResolverNetdCallbacks",
    "size" : 20,
    "source_file" : "/packages/modules/DnsResolver/include/netd_resolv/resolv.h"
   },
@@ -469,8 +469,8 @@
    "is_const" : true,
    "linker_set_key" : "_ZTIKc",
    "name" : "const char",
-   "referenced_type" : "type-6",
-   "self_type" : "type-5",
+   "referenced_type" : "_ZTIc",
+   "self_type" : "_ZTIKc",
    "size" : 1,
    "source_file" : "/packages/modules/DnsResolver/include/netd_resolv/resolv.h"
   }
@@ -483,43 +483,43 @@
    [
     {
      "field_name" : "app_netid",
-     "referenced_type" : "type-2"
+     "referenced_type" : "_ZTIj"
     },
     {
      "field_name" : "app_mark",
      "field_offset" : 32,
-     "referenced_type" : "type-2"
+     "referenced_type" : "_ZTIj"
     },
     {
      "field_name" : "dns_netid",
      "field_offset" : 64,
-     "referenced_type" : "type-2"
+     "referenced_type" : "_ZTIj"
     },
     {
      "field_name" : "dns_mark",
      "field_offset" : 96,
-     "referenced_type" : "type-2"
+     "referenced_type" : "_ZTIj"
     },
     {
      "field_name" : "uid",
      "field_offset" : 128,
-     "referenced_type" : "type-2"
+     "referenced_type" : "_ZTIj"
     },
     {
      "field_name" : "flags",
      "field_offset" : 160,
-     "referenced_type" : "type-2"
+     "referenced_type" : "_ZTIj"
     },
     {
      "field_name" : "pid",
      "field_offset" : 192,
-     "referenced_type" : "type-3"
+     "referenced_type" : "_ZTIi"
     }
    ],
    "linker_set_key" : "_ZTI19android_net_context",
    "name" : "android_net_context",
-   "referenced_type" : "type-1",
-   "self_type" : "type-1",
+   "referenced_type" : "_ZTI19android_net_context",
+   "self_type" : "_ZTI19android_net_context",
    "size" : 28,
    "source_file" : "/packages/modules/DnsResolver/include/netd_resolv/resolv.h"
   },
@@ -529,33 +529,33 @@
    [
     {
      "field_name" : "check_calling_permission",
-     "referenced_type" : "type-13"
+     "referenced_type" : "_ZTIPFbPKcE"
     },
     {
      "field_name" : "get_network_context",
      "field_offset" : 32,
-     "referenced_type" : "type-16"
+     "referenced_type" : "_ZTIPFvjjP19android_net_contextE"
     },
     {
      "field_name" : "log",
      "field_offset" : 64,
-     "referenced_type" : "type-7"
+     "referenced_type" : "_ZTIPFvPKcE"
     },
     {
      "field_name" : "tagSocket",
      "field_offset" : 96,
-     "referenced_type" : "type-20"
+     "referenced_type" : "_ZTIPFiijjiE"
     },
     {
      "field_name" : "evaluate_domain_name",
      "field_offset" : 128,
-     "referenced_type" : "type-21"
+     "referenced_type" : "_ZTIPFbRK19android_net_contextPKcE"
     }
    ],
    "linker_set_key" : "_ZTI21ResolverNetdCallbacks",
    "name" : "ResolverNetdCallbacks",
-   "referenced_type" : "type-12",
-   "self_type" : "type-12",
+   "referenced_type" : "_ZTI21ResolverNetdCallbacks",
+   "self_type" : "_ZTI21ResolverNetdCallbacks",
    "size" : 20,
    "source_file" : "/packages/modules/DnsResolver/include/netd_resolv/resolv.h"
   }