Delete VNDK ABI dumps for R

Test: make
Bug: 156211517
Change-Id: I3b560526b158fe2632c9475d1f1ab44af20263a5
diff --git a/R/64/arm64_armv8-a/source-based/libcgrouprc.so.lsdump b/R/64/arm64_armv8-a/source-based/libcgrouprc.so.lsdump
deleted file mode 100644
index f433ef5..0000000
--- a/R/64/arm64_armv8-a/source-based/libcgrouprc.so.lsdump
+++ /dev/null
@@ -1,202 +0,0 @@
-{
- "array_types" : [],
- "builtin_types" :
- [
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "_ZTIc",
-   "name" : "char",
-   "referenced_type" : "_ZTIc",
-   "self_type" : "_ZTIc",
-   "size" : 1
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "_ZTIj",
-   "name" : "unsigned int",
-   "referenced_type" : "_ZTIj",
-   "self_type" : "_ZTIj",
-   "size" : 4
-  },
-  {
-   "alignment" : 8,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "_ZTIm",
-   "name" : "unsigned long",
-   "referenced_type" : "_ZTIm",
-   "self_type" : "_ZTIm",
-   "size" : 8
-  },
-  {
-   "linker_set_key" : "_ZTIv",
-   "name" : "void",
-   "referenced_type" : "_ZTIv",
-   "self_type" : "_ZTIv"
-  }
- ],
- "elf_functions" :
- [
-  {
-   "binding" : "weak",
-   "name" : "ACgroupController_getFlags"
-  },
-  {
-   "name" : "ACgroupController_getName"
-  },
-  {
-   "name" : "ACgroupController_getPath"
-  },
-  {
-   "name" : "ACgroupController_getVersion"
-  },
-  {
-   "name" : "ACgroupFile_getController"
-  },
-  {
-   "name" : "ACgroupFile_getControllerCount"
-  },
-  {
-   "name" : "ACgroupFile_getVersion"
-  }
- ],
- "elf_objects" : [],
- "enum_types" : [],
- "function_types" : [],
- "functions" :
- [
-  {
-   "function_name" : "ACgroupController_getFlags",
-   "linker_set_key" : "ACgroupController_getFlags",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK17ACgroupController"
-    }
-   ],
-   "return_type" : "_ZTIj",
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  },
-  {
-   "function_name" : "ACgroupController_getName",
-   "linker_set_key" : "ACgroupController_getName",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK17ACgroupController"
-    }
-   ],
-   "return_type" : "_ZTIPKc",
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  },
-  {
-   "function_name" : "ACgroupController_getPath",
-   "linker_set_key" : "ACgroupController_getPath",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK17ACgroupController"
-    }
-   ],
-   "return_type" : "_ZTIPKc",
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  },
-  {
-   "function_name" : "ACgroupController_getVersion",
-   "linker_set_key" : "ACgroupController_getVersion",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK17ACgroupController"
-    }
-   ],
-   "return_type" : "_ZTIj",
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  },
-  {
-   "function_name" : "ACgroupFile_getController",
-   "linker_set_key" : "ACgroupFile_getController",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIPK17ACgroupController#ODR:out/soong/.intermediates/system/core/libprocessgroup/cgrouprc/libcgrouprc/android_arm64_armv8-a_static/obj/system/core/libprocessgroup/cgrouprc/cgroup_file.sdump",
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  },
-  {
-   "function_name" : "ACgroupFile_getControllerCount",
-   "linker_set_key" : "ACgroupFile_getControllerCount",
-   "return_type" : "_ZTIj",
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  },
-  {
-   "function_name" : "ACgroupFile_getVersion",
-   "linker_set_key" : "ACgroupFile_getVersion",
-   "return_type" : "_ZTIj",
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  }
- ],
- "global_vars" : [],
- "lvalue_reference_types" : [],
- "pointer_types" :
- [
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK17ACgroupController",
-   "name" : "const ACgroupController *",
-   "referenced_type" : "_ZTIK17ACgroupController",
-   "self_type" : "_ZTIPK17ACgroupController",
-   "size" : 8,
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK17ACgroupController",
-   "name" : "const ACgroupController *",
-   "referenced_type" : "_ZTIK17ACgroupController#ODR:out/soong/.intermediates/system/core/libprocessgroup/cgrouprc/libcgrouprc/android_arm64_armv8-a_static/obj/system/core/libprocessgroup/cgrouprc/cgroup_file.sdump",
-   "self_type" : "_ZTIPK17ACgroupController#ODR:out/soong/.intermediates/system/core/libprocessgroup/cgrouprc/libcgrouprc/android_arm64_armv8-a_static/obj/system/core/libprocessgroup/cgrouprc/cgroup_file.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKc",
-   "name" : "const char *",
-   "referenced_type" : "_ZTIKc",
-   "self_type" : "_ZTIPKc",
-   "size" : 8,
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  }
- ],
- "qualified_types" :
- [
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIK17ACgroupController",
-   "name" : "const ACgroupController",
-   "referenced_type" : "_ZTI17ACgroupController",
-   "self_type" : "_ZTIK17ACgroupController",
-   "size" : 56,
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKc",
-   "name" : "const char",
-   "referenced_type" : "_ZTIc",
-   "self_type" : "_ZTIKc",
-   "size" : 1,
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  }
- ],
- "record_types" : [],
- "rvalue_reference_types" : []
-}
diff --git a/R/64/arm64_armv8-a/source-based/libvndksupport.so.lsdump b/R/64/arm64_armv8-a/source-based/libvndksupport.so.lsdump
deleted file mode 100644
index 78935b3..0000000
--- a/R/64/arm64_armv8-a/source-based/libvndksupport.so.lsdump
+++ /dev/null
@@ -1,120 +0,0 @@
-{
- "array_types" : [],
- "builtin_types" :
- [
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "_ZTIc",
-   "name" : "char",
-   "referenced_type" : "_ZTIc",
-   "self_type" : "_ZTIc",
-   "size" : 1
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "linker_set_key" : "_ZTIi",
-   "name" : "int",
-   "referenced_type" : "_ZTIi",
-   "self_type" : "_ZTIi",
-   "size" : 4
-  },
-  {
-   "linker_set_key" : "_ZTIv",
-   "name" : "void",
-   "referenced_type" : "_ZTIv",
-   "self_type" : "_ZTIv"
-  }
- ],
- "elf_functions" :
- [
-  {
-   "name" : "android_is_in_vendor_process"
-  },
-  {
-   "name" : "android_load_sphal_library"
-  },
-  {
-   "name" : "android_unload_sphal_library"
-  }
- ],
- "elf_objects" : [],
- "enum_types" : [],
- "function_types" : [],
- "functions" :
- [
-  {
-   "function_name" : "android_is_in_vendor_process",
-   "linker_set_key" : "android_is_in_vendor_process",
-   "return_type" : "_ZTIi",
-   "source_file" : "/system/core/libvndksupport/include/vndksupport/linker.h"
-  },
-  {
-   "function_name" : "android_load_sphal_library",
-   "linker_set_key" : "android_load_sphal_library",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIPv",
-   "source_file" : "/system/core/libvndksupport/include/vndksupport/linker.h"
-  },
-  {
-   "function_name" : "android_unload_sphal_library",
-   "linker_set_key" : "android_unload_sphal_library",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPv"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "/system/core/libvndksupport/include/vndksupport/linker.h"
-  }
- ],
- "global_vars" : [],
- "lvalue_reference_types" : [],
- "pointer_types" :
- [
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKc",
-   "name" : "const char *",
-   "referenced_type" : "_ZTIKc",
-   "self_type" : "_ZTIPKc",
-   "size" : 8,
-   "source_file" : "/system/core/libvndksupport/include/vndksupport/linker.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPv",
-   "name" : "void *",
-   "referenced_type" : "_ZTIv",
-   "self_type" : "_ZTIPv",
-   "size" : 8,
-   "source_file" : "/system/core/libvndksupport/include/vndksupport/linker.h"
-  }
- ],
- "qualified_types" :
- [
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKc",
-   "name" : "const char",
-   "referenced_type" : "_ZTIc",
-   "self_type" : "_ZTIKc",
-   "size" : 1,
-   "source_file" : "/system/core/libvndksupport/include/vndksupport/linker.h"
-  }
- ],
- "record_types" : [],
- "rvalue_reference_types" : []
-}
diff --git a/R/64/arm_armv7-a-neon/source-based/libcgrouprc.so.lsdump b/R/64/arm_armv7-a-neon/source-based/libcgrouprc.so.lsdump
deleted file mode 100644
index d52f97c..0000000
--- a/R/64/arm_armv7-a-neon/source-based/libcgrouprc.so.lsdump
+++ /dev/null
@@ -1,192 +0,0 @@
-{
- "array_types" : [],
- "builtin_types" :
- [
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "_ZTIc",
-   "name" : "char",
-   "referenced_type" : "_ZTIc",
-   "self_type" : "_ZTIc",
-   "size" : 1
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "_ZTIj",
-   "name" : "unsigned int",
-   "referenced_type" : "_ZTIj",
-   "self_type" : "_ZTIj",
-   "size" : 4
-  },
-  {
-   "linker_set_key" : "_ZTIv",
-   "name" : "void",
-   "referenced_type" : "_ZTIv",
-   "self_type" : "_ZTIv"
-  }
- ],
- "elf_functions" :
- [
-  {
-   "binding" : "weak",
-   "name" : "ACgroupController_getFlags"
-  },
-  {
-   "name" : "ACgroupController_getName"
-  },
-  {
-   "name" : "ACgroupController_getPath"
-  },
-  {
-   "name" : "ACgroupController_getVersion"
-  },
-  {
-   "name" : "ACgroupFile_getController"
-  },
-  {
-   "name" : "ACgroupFile_getControllerCount"
-  },
-  {
-   "name" : "ACgroupFile_getVersion"
-  }
- ],
- "elf_objects" : [],
- "enum_types" : [],
- "function_types" : [],
- "functions" :
- [
-  {
-   "function_name" : "ACgroupController_getFlags",
-   "linker_set_key" : "ACgroupController_getFlags",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK17ACgroupController"
-    }
-   ],
-   "return_type" : "_ZTIj",
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  },
-  {
-   "function_name" : "ACgroupController_getName",
-   "linker_set_key" : "ACgroupController_getName",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK17ACgroupController"
-    }
-   ],
-   "return_type" : "_ZTIPKc",
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  },
-  {
-   "function_name" : "ACgroupController_getPath",
-   "linker_set_key" : "ACgroupController_getPath",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK17ACgroupController"
-    }
-   ],
-   "return_type" : "_ZTIPKc",
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  },
-  {
-   "function_name" : "ACgroupController_getVersion",
-   "linker_set_key" : "ACgroupController_getVersion",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK17ACgroupController"
-    }
-   ],
-   "return_type" : "_ZTIj",
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  },
-  {
-   "function_name" : "ACgroupFile_getController",
-   "linker_set_key" : "ACgroupFile_getController",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIPK17ACgroupController#ODR:out/soong/.intermediates/system/core/libprocessgroup/cgrouprc/libcgrouprc/android_arm_armv7-a-neon_static/obj/system/core/libprocessgroup/cgrouprc/cgroup_file.sdump",
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  },
-  {
-   "function_name" : "ACgroupFile_getControllerCount",
-   "linker_set_key" : "ACgroupFile_getControllerCount",
-   "return_type" : "_ZTIj",
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  },
-  {
-   "function_name" : "ACgroupFile_getVersion",
-   "linker_set_key" : "ACgroupFile_getVersion",
-   "return_type" : "_ZTIj",
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  }
- ],
- "global_vars" : [],
- "lvalue_reference_types" : [],
- "pointer_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK17ACgroupController",
-   "name" : "const ACgroupController *",
-   "referenced_type" : "_ZTIK17ACgroupController",
-   "self_type" : "_ZTIPK17ACgroupController",
-   "size" : 4,
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK17ACgroupController",
-   "name" : "const ACgroupController *",
-   "referenced_type" : "_ZTIK17ACgroupController#ODR:out/soong/.intermediates/system/core/libprocessgroup/cgrouprc/libcgrouprc/android_arm_armv7-a-neon_static/obj/system/core/libprocessgroup/cgrouprc/cgroup_file.sdump",
-   "self_type" : "_ZTIPK17ACgroupController#ODR:out/soong/.intermediates/system/core/libprocessgroup/cgrouprc/libcgrouprc/android_arm_armv7-a-neon_static/obj/system/core/libprocessgroup/cgrouprc/cgroup_file.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKc",
-   "name" : "const char *",
-   "referenced_type" : "_ZTIKc",
-   "self_type" : "_ZTIPKc",
-   "size" : 4,
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  }
- ],
- "qualified_types" :
- [
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIK17ACgroupController",
-   "name" : "const ACgroupController",
-   "referenced_type" : "_ZTI17ACgroupController",
-   "self_type" : "_ZTIK17ACgroupController",
-   "size" : 56,
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKc",
-   "name" : "const char",
-   "referenced_type" : "_ZTIc",
-   "self_type" : "_ZTIKc",
-   "size" : 1,
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  }
- ],
- "record_types" : [],
- "rvalue_reference_types" : []
-}
diff --git a/R/64/arm_armv7-a-neon/source-based/libvndksupport.so.lsdump b/R/64/arm_armv7-a-neon/source-based/libvndksupport.so.lsdump
deleted file mode 100644
index afde9c2..0000000
--- a/R/64/arm_armv7-a-neon/source-based/libvndksupport.so.lsdump
+++ /dev/null
@@ -1,223 +0,0 @@
-{
- "array_types" : [],
- "builtin_types" :
- [
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "_ZTIb",
-   "name" : "bool",
-   "referenced_type" : "_ZTIb",
-   "self_type" : "_ZTIb",
-   "size" : 1
-  },
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "_ZTIc",
-   "name" : "char",
-   "referenced_type" : "_ZTIc",
-   "self_type" : "_ZTIc",
-   "size" : 1
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTId",
-   "name" : "double",
-   "referenced_type" : "_ZTId",
-   "self_type" : "_ZTId",
-   "size" : 8
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIe",
-   "name" : "long double",
-   "referenced_type" : "_ZTIe",
-   "self_type" : "_ZTIe",
-   "size" : 8
-  },
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "_ZTIh",
-   "name" : "unsigned char",
-   "referenced_type" : "_ZTIh",
-   "self_type" : "_ZTIh",
-   "size" : 1
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "linker_set_key" : "_ZTIi",
-   "name" : "int",
-   "referenced_type" : "_ZTIi",
-   "self_type" : "_ZTIi",
-   "size" : 4
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "_ZTIj",
-   "name" : "unsigned int",
-   "referenced_type" : "_ZTIj",
-   "self_type" : "_ZTIj",
-   "size" : 4
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "linker_set_key" : "_ZTIl",
-   "name" : "long",
-   "referenced_type" : "_ZTIl",
-   "self_type" : "_ZTIl",
-   "size" : 4
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "_ZTIm",
-   "name" : "unsigned long",
-   "referenced_type" : "_ZTIm",
-   "self_type" : "_ZTIm",
-   "size" : 4
-  },
-  {
-   "alignment" : 2,
-   "is_integral" : true,
-   "linker_set_key" : "_ZTIs",
-   "name" : "short",
-   "referenced_type" : "_ZTIs",
-   "self_type" : "_ZTIs",
-   "size" : 2
-  },
-  {
-   "alignment" : 2,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "_ZTIt",
-   "name" : "unsigned short",
-   "referenced_type" : "_ZTIt",
-   "self_type" : "_ZTIt",
-   "size" : 2
-  },
-  {
-   "linker_set_key" : "_ZTIv",
-   "name" : "void",
-   "referenced_type" : "_ZTIv",
-   "self_type" : "_ZTIv"
-  },
-  {
-   "alignment" : 8,
-   "is_integral" : true,
-   "linker_set_key" : "_ZTIx",
-   "name" : "long long",
-   "referenced_type" : "_ZTIx",
-   "self_type" : "_ZTIx",
-   "size" : 8
-  },
-  {
-   "alignment" : 8,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "_ZTIy",
-   "name" : "unsigned long long",
-   "referenced_type" : "_ZTIy",
-   "self_type" : "_ZTIy",
-   "size" : 8
-  }
- ],
- "elf_functions" :
- [
-  {
-   "name" : "android_is_in_vendor_process"
-  },
-  {
-   "name" : "android_load_sphal_library"
-  },
-  {
-   "name" : "android_unload_sphal_library"
-  }
- ],
- "elf_objects" : [],
- "enum_types" : [],
- "function_types" : [],
- "functions" :
- [
-  {
-   "function_name" : "android_is_in_vendor_process",
-   "linker_set_key" : "android_is_in_vendor_process",
-   "return_type" : "_ZTIi",
-   "source_file" : "/system/core/libvndksupport/include/vndksupport/linker.h"
-  },
-  {
-   "function_name" : "android_load_sphal_library",
-   "linker_set_key" : "android_load_sphal_library",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIPv",
-   "source_file" : "/system/core/libvndksupport/include/vndksupport/linker.h"
-  },
-  {
-   "function_name" : "android_unload_sphal_library",
-   "linker_set_key" : "android_unload_sphal_library",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPv"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "/system/core/libvndksupport/include/vndksupport/linker.h"
-  }
- ],
- "global_vars" : [],
- "lvalue_reference_types" : [],
- "pointer_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKc",
-   "name" : "const char *",
-   "referenced_type" : "_ZTIKc",
-   "self_type" : "_ZTIPKc",
-   "size" : 4,
-   "source_file" : "/system/core/libvndksupport/include/vndksupport/linker.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPv",
-   "name" : "void *",
-   "referenced_type" : "_ZTIv",
-   "self_type" : "_ZTIPv",
-   "size" : 4,
-   "source_file" : "/system/core/libvndksupport/include/vndksupport/linker.h"
-  }
- ],
- "qualified_types" :
- [
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKc",
-   "name" : "const char",
-   "referenced_type" : "_ZTIc",
-   "self_type" : "_ZTIKc",
-   "size" : 1,
-   "source_file" : "/system/core/libvndksupport/include/vndksupport/linker.h"
-  }
- ],
- "record_types" : [],
- "rvalue_reference_types" : []
-}
diff --git a/R/64/arm_armv8-a/source-based/libcgrouprc.so.lsdump b/R/64/arm_armv8-a/source-based/libcgrouprc.so.lsdump
deleted file mode 100644
index ada415d..0000000
--- a/R/64/arm_armv8-a/source-based/libcgrouprc.so.lsdump
+++ /dev/null
@@ -1,192 +0,0 @@
-{
- "array_types" : [],
- "builtin_types" :
- [
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "_ZTIc",
-   "name" : "char",
-   "referenced_type" : "_ZTIc",
-   "self_type" : "_ZTIc",
-   "size" : 1
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "_ZTIj",
-   "name" : "unsigned int",
-   "referenced_type" : "_ZTIj",
-   "self_type" : "_ZTIj",
-   "size" : 4
-  },
-  {
-   "linker_set_key" : "_ZTIv",
-   "name" : "void",
-   "referenced_type" : "_ZTIv",
-   "self_type" : "_ZTIv"
-  }
- ],
- "elf_functions" :
- [
-  {
-   "binding" : "weak",
-   "name" : "ACgroupController_getFlags"
-  },
-  {
-   "name" : "ACgroupController_getName"
-  },
-  {
-   "name" : "ACgroupController_getPath"
-  },
-  {
-   "name" : "ACgroupController_getVersion"
-  },
-  {
-   "name" : "ACgroupFile_getController"
-  },
-  {
-   "name" : "ACgroupFile_getControllerCount"
-  },
-  {
-   "name" : "ACgroupFile_getVersion"
-  }
- ],
- "elf_objects" : [],
- "enum_types" : [],
- "function_types" : [],
- "functions" :
- [
-  {
-   "function_name" : "ACgroupController_getFlags",
-   "linker_set_key" : "ACgroupController_getFlags",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK17ACgroupController"
-    }
-   ],
-   "return_type" : "_ZTIj",
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  },
-  {
-   "function_name" : "ACgroupController_getName",
-   "linker_set_key" : "ACgroupController_getName",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK17ACgroupController"
-    }
-   ],
-   "return_type" : "_ZTIPKc",
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  },
-  {
-   "function_name" : "ACgroupController_getPath",
-   "linker_set_key" : "ACgroupController_getPath",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK17ACgroupController"
-    }
-   ],
-   "return_type" : "_ZTIPKc",
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  },
-  {
-   "function_name" : "ACgroupController_getVersion",
-   "linker_set_key" : "ACgroupController_getVersion",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK17ACgroupController"
-    }
-   ],
-   "return_type" : "_ZTIj",
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  },
-  {
-   "function_name" : "ACgroupFile_getController",
-   "linker_set_key" : "ACgroupFile_getController",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIPK17ACgroupController#ODR:out/soong/.intermediates/system/core/libprocessgroup/cgrouprc/libcgrouprc/android_arm_armv8-a_static/obj/system/core/libprocessgroup/cgrouprc/cgroup_file.sdump",
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  },
-  {
-   "function_name" : "ACgroupFile_getControllerCount",
-   "linker_set_key" : "ACgroupFile_getControllerCount",
-   "return_type" : "_ZTIj",
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  },
-  {
-   "function_name" : "ACgroupFile_getVersion",
-   "linker_set_key" : "ACgroupFile_getVersion",
-   "return_type" : "_ZTIj",
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  }
- ],
- "global_vars" : [],
- "lvalue_reference_types" : [],
- "pointer_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK17ACgroupController",
-   "name" : "const ACgroupController *",
-   "referenced_type" : "_ZTIK17ACgroupController",
-   "self_type" : "_ZTIPK17ACgroupController",
-   "size" : 4,
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK17ACgroupController",
-   "name" : "const ACgroupController *",
-   "referenced_type" : "_ZTIK17ACgroupController#ODR:out/soong/.intermediates/system/core/libprocessgroup/cgrouprc/libcgrouprc/android_arm_armv8-a_static/obj/system/core/libprocessgroup/cgrouprc/cgroup_file.sdump",
-   "self_type" : "_ZTIPK17ACgroupController#ODR:out/soong/.intermediates/system/core/libprocessgroup/cgrouprc/libcgrouprc/android_arm_armv8-a_static/obj/system/core/libprocessgroup/cgrouprc/cgroup_file.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKc",
-   "name" : "const char *",
-   "referenced_type" : "_ZTIKc",
-   "self_type" : "_ZTIPKc",
-   "size" : 4,
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  }
- ],
- "qualified_types" :
- [
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIK17ACgroupController",
-   "name" : "const ACgroupController",
-   "referenced_type" : "_ZTI17ACgroupController",
-   "self_type" : "_ZTIK17ACgroupController",
-   "size" : 56,
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKc",
-   "name" : "const char",
-   "referenced_type" : "_ZTIc",
-   "self_type" : "_ZTIKc",
-   "size" : 1,
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  }
- ],
- "record_types" : [],
- "rvalue_reference_types" : []
-}
diff --git a/R/64/arm_armv8-a/source-based/libvndksupport.so.lsdump b/R/64/arm_armv8-a/source-based/libvndksupport.so.lsdump
deleted file mode 100644
index afde9c2..0000000
--- a/R/64/arm_armv8-a/source-based/libvndksupport.so.lsdump
+++ /dev/null
@@ -1,223 +0,0 @@
-{
- "array_types" : [],
- "builtin_types" :
- [
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "_ZTIb",
-   "name" : "bool",
-   "referenced_type" : "_ZTIb",
-   "self_type" : "_ZTIb",
-   "size" : 1
-  },
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "_ZTIc",
-   "name" : "char",
-   "referenced_type" : "_ZTIc",
-   "self_type" : "_ZTIc",
-   "size" : 1
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTId",
-   "name" : "double",
-   "referenced_type" : "_ZTId",
-   "self_type" : "_ZTId",
-   "size" : 8
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIe",
-   "name" : "long double",
-   "referenced_type" : "_ZTIe",
-   "self_type" : "_ZTIe",
-   "size" : 8
-  },
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "_ZTIh",
-   "name" : "unsigned char",
-   "referenced_type" : "_ZTIh",
-   "self_type" : "_ZTIh",
-   "size" : 1
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "linker_set_key" : "_ZTIi",
-   "name" : "int",
-   "referenced_type" : "_ZTIi",
-   "self_type" : "_ZTIi",
-   "size" : 4
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "_ZTIj",
-   "name" : "unsigned int",
-   "referenced_type" : "_ZTIj",
-   "self_type" : "_ZTIj",
-   "size" : 4
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "linker_set_key" : "_ZTIl",
-   "name" : "long",
-   "referenced_type" : "_ZTIl",
-   "self_type" : "_ZTIl",
-   "size" : 4
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "_ZTIm",
-   "name" : "unsigned long",
-   "referenced_type" : "_ZTIm",
-   "self_type" : "_ZTIm",
-   "size" : 4
-  },
-  {
-   "alignment" : 2,
-   "is_integral" : true,
-   "linker_set_key" : "_ZTIs",
-   "name" : "short",
-   "referenced_type" : "_ZTIs",
-   "self_type" : "_ZTIs",
-   "size" : 2
-  },
-  {
-   "alignment" : 2,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "_ZTIt",
-   "name" : "unsigned short",
-   "referenced_type" : "_ZTIt",
-   "self_type" : "_ZTIt",
-   "size" : 2
-  },
-  {
-   "linker_set_key" : "_ZTIv",
-   "name" : "void",
-   "referenced_type" : "_ZTIv",
-   "self_type" : "_ZTIv"
-  },
-  {
-   "alignment" : 8,
-   "is_integral" : true,
-   "linker_set_key" : "_ZTIx",
-   "name" : "long long",
-   "referenced_type" : "_ZTIx",
-   "self_type" : "_ZTIx",
-   "size" : 8
-  },
-  {
-   "alignment" : 8,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "_ZTIy",
-   "name" : "unsigned long long",
-   "referenced_type" : "_ZTIy",
-   "self_type" : "_ZTIy",
-   "size" : 8
-  }
- ],
- "elf_functions" :
- [
-  {
-   "name" : "android_is_in_vendor_process"
-  },
-  {
-   "name" : "android_load_sphal_library"
-  },
-  {
-   "name" : "android_unload_sphal_library"
-  }
- ],
- "elf_objects" : [],
- "enum_types" : [],
- "function_types" : [],
- "functions" :
- [
-  {
-   "function_name" : "android_is_in_vendor_process",
-   "linker_set_key" : "android_is_in_vendor_process",
-   "return_type" : "_ZTIi",
-   "source_file" : "/system/core/libvndksupport/include/vndksupport/linker.h"
-  },
-  {
-   "function_name" : "android_load_sphal_library",
-   "linker_set_key" : "android_load_sphal_library",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIPv",
-   "source_file" : "/system/core/libvndksupport/include/vndksupport/linker.h"
-  },
-  {
-   "function_name" : "android_unload_sphal_library",
-   "linker_set_key" : "android_unload_sphal_library",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPv"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "/system/core/libvndksupport/include/vndksupport/linker.h"
-  }
- ],
- "global_vars" : [],
- "lvalue_reference_types" : [],
- "pointer_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKc",
-   "name" : "const char *",
-   "referenced_type" : "_ZTIKc",
-   "self_type" : "_ZTIPKc",
-   "size" : 4,
-   "source_file" : "/system/core/libvndksupport/include/vndksupport/linker.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPv",
-   "name" : "void *",
-   "referenced_type" : "_ZTIv",
-   "self_type" : "_ZTIPv",
-   "size" : 4,
-   "source_file" : "/system/core/libvndksupport/include/vndksupport/linker.h"
-  }
- ],
- "qualified_types" :
- [
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKc",
-   "name" : "const char",
-   "referenced_type" : "_ZTIc",
-   "self_type" : "_ZTIKc",
-   "size" : 1,
-   "source_file" : "/system/core/libvndksupport/include/vndksupport/linker.h"
-  }
- ],
- "record_types" : [],
- "rvalue_reference_types" : []
-}
diff --git a/R/64/x86/source-based/libcgrouprc.so.lsdump b/R/64/x86/source-based/libcgrouprc.so.lsdump
deleted file mode 100644
index c6ff3a9..0000000
--- a/R/64/x86/source-based/libcgrouprc.so.lsdump
+++ /dev/null
@@ -1,191 +0,0 @@
-{
- "array_types" : [],
- "builtin_types" :
- [
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "linker_set_key" : "_ZTIc",
-   "name" : "char",
-   "referenced_type" : "_ZTIc",
-   "self_type" : "_ZTIc",
-   "size" : 1
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "_ZTIj",
-   "name" : "unsigned int",
-   "referenced_type" : "_ZTIj",
-   "self_type" : "_ZTIj",
-   "size" : 4
-  },
-  {
-   "linker_set_key" : "_ZTIv",
-   "name" : "void",
-   "referenced_type" : "_ZTIv",
-   "self_type" : "_ZTIv"
-  }
- ],
- "elf_functions" :
- [
-  {
-   "binding" : "weak",
-   "name" : "ACgroupController_getFlags"
-  },
-  {
-   "name" : "ACgroupController_getName"
-  },
-  {
-   "name" : "ACgroupController_getPath"
-  },
-  {
-   "name" : "ACgroupController_getVersion"
-  },
-  {
-   "name" : "ACgroupFile_getController"
-  },
-  {
-   "name" : "ACgroupFile_getControllerCount"
-  },
-  {
-   "name" : "ACgroupFile_getVersion"
-  }
- ],
- "elf_objects" : [],
- "enum_types" : [],
- "function_types" : [],
- "functions" :
- [
-  {
-   "function_name" : "ACgroupController_getFlags",
-   "linker_set_key" : "ACgroupController_getFlags",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK17ACgroupController"
-    }
-   ],
-   "return_type" : "_ZTIj",
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  },
-  {
-   "function_name" : "ACgroupController_getName",
-   "linker_set_key" : "ACgroupController_getName",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK17ACgroupController"
-    }
-   ],
-   "return_type" : "_ZTIPKc",
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  },
-  {
-   "function_name" : "ACgroupController_getPath",
-   "linker_set_key" : "ACgroupController_getPath",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK17ACgroupController"
-    }
-   ],
-   "return_type" : "_ZTIPKc",
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  },
-  {
-   "function_name" : "ACgroupController_getVersion",
-   "linker_set_key" : "ACgroupController_getVersion",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK17ACgroupController"
-    }
-   ],
-   "return_type" : "_ZTIj",
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  },
-  {
-   "function_name" : "ACgroupFile_getController",
-   "linker_set_key" : "ACgroupFile_getController",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIPK17ACgroupController#ODR:out/soong/.intermediates/system/core/libprocessgroup/cgrouprc/libcgrouprc/android_x86_static/obj/system/core/libprocessgroup/cgrouprc/cgroup_file.sdump",
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  },
-  {
-   "function_name" : "ACgroupFile_getControllerCount",
-   "linker_set_key" : "ACgroupFile_getControllerCount",
-   "return_type" : "_ZTIj",
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  },
-  {
-   "function_name" : "ACgroupFile_getVersion",
-   "linker_set_key" : "ACgroupFile_getVersion",
-   "return_type" : "_ZTIj",
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  }
- ],
- "global_vars" : [],
- "lvalue_reference_types" : [],
- "pointer_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK17ACgroupController",
-   "name" : "const ACgroupController *",
-   "referenced_type" : "_ZTIK17ACgroupController",
-   "self_type" : "_ZTIPK17ACgroupController",
-   "size" : 4,
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK17ACgroupController",
-   "name" : "const ACgroupController *",
-   "referenced_type" : "_ZTIK17ACgroupController#ODR:out/soong/.intermediates/system/core/libprocessgroup/cgrouprc/libcgrouprc/android_x86_static/obj/system/core/libprocessgroup/cgrouprc/cgroup_file.sdump",
-   "self_type" : "_ZTIPK17ACgroupController#ODR:out/soong/.intermediates/system/core/libprocessgroup/cgrouprc/libcgrouprc/android_x86_static/obj/system/core/libprocessgroup/cgrouprc/cgroup_file.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKc",
-   "name" : "const char *",
-   "referenced_type" : "_ZTIKc",
-   "self_type" : "_ZTIPKc",
-   "size" : 4,
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  }
- ],
- "qualified_types" :
- [
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIK17ACgroupController",
-   "name" : "const ACgroupController",
-   "referenced_type" : "_ZTI17ACgroupController",
-   "self_type" : "_ZTIK17ACgroupController",
-   "size" : 56,
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKc",
-   "name" : "const char",
-   "referenced_type" : "_ZTIc",
-   "self_type" : "_ZTIKc",
-   "size" : 1,
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  }
- ],
- "record_types" : [],
- "rvalue_reference_types" : []
-}
diff --git a/R/64/x86/source-based/libvndksupport.so.lsdump b/R/64/x86/source-based/libvndksupport.so.lsdump
deleted file mode 100644
index 2fce828..0000000
--- a/R/64/x86/source-based/libvndksupport.so.lsdump
+++ /dev/null
@@ -1,119 +0,0 @@
-{
- "array_types" : [],
- "builtin_types" :
- [
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "linker_set_key" : "_ZTIc",
-   "name" : "char",
-   "referenced_type" : "_ZTIc",
-   "self_type" : "_ZTIc",
-   "size" : 1
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "linker_set_key" : "_ZTIi",
-   "name" : "int",
-   "referenced_type" : "_ZTIi",
-   "self_type" : "_ZTIi",
-   "size" : 4
-  },
-  {
-   "linker_set_key" : "_ZTIv",
-   "name" : "void",
-   "referenced_type" : "_ZTIv",
-   "self_type" : "_ZTIv"
-  }
- ],
- "elf_functions" :
- [
-  {
-   "name" : "android_is_in_vendor_process"
-  },
-  {
-   "name" : "android_load_sphal_library"
-  },
-  {
-   "name" : "android_unload_sphal_library"
-  }
- ],
- "elf_objects" : [],
- "enum_types" : [],
- "function_types" : [],
- "functions" :
- [
-  {
-   "function_name" : "android_is_in_vendor_process",
-   "linker_set_key" : "android_is_in_vendor_process",
-   "return_type" : "_ZTIi",
-   "source_file" : "/system/core/libvndksupport/include/vndksupport/linker.h"
-  },
-  {
-   "function_name" : "android_load_sphal_library",
-   "linker_set_key" : "android_load_sphal_library",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIPv",
-   "source_file" : "/system/core/libvndksupport/include/vndksupport/linker.h"
-  },
-  {
-   "function_name" : "android_unload_sphal_library",
-   "linker_set_key" : "android_unload_sphal_library",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPv"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "/system/core/libvndksupport/include/vndksupport/linker.h"
-  }
- ],
- "global_vars" : [],
- "lvalue_reference_types" : [],
- "pointer_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKc",
-   "name" : "const char *",
-   "referenced_type" : "_ZTIKc",
-   "self_type" : "_ZTIPKc",
-   "size" : 4,
-   "source_file" : "/system/core/libvndksupport/include/vndksupport/linker.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPv",
-   "name" : "void *",
-   "referenced_type" : "_ZTIv",
-   "self_type" : "_ZTIPv",
-   "size" : 4,
-   "source_file" : "/system/core/libvndksupport/include/vndksupport/linker.h"
-  }
- ],
- "qualified_types" :
- [
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKc",
-   "name" : "const char",
-   "referenced_type" : "_ZTIc",
-   "self_type" : "_ZTIKc",
-   "size" : 1,
-   "source_file" : "/system/core/libvndksupport/include/vndksupport/linker.h"
-  }
- ],
- "record_types" : [],
- "rvalue_reference_types" : []
-}
diff --git a/R/64/x86_64/source-based/libcgrouprc.so.lsdump b/R/64/x86_64/source-based/libcgrouprc.so.lsdump
deleted file mode 100644
index 9fae190..0000000
--- a/R/64/x86_64/source-based/libcgrouprc.so.lsdump
+++ /dev/null
@@ -1,201 +0,0 @@
-{
- "array_types" : [],
- "builtin_types" :
- [
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "linker_set_key" : "_ZTIc",
-   "name" : "char",
-   "referenced_type" : "_ZTIc",
-   "self_type" : "_ZTIc",
-   "size" : 1
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "_ZTIj",
-   "name" : "unsigned int",
-   "referenced_type" : "_ZTIj",
-   "self_type" : "_ZTIj",
-   "size" : 4
-  },
-  {
-   "alignment" : 8,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "_ZTIm",
-   "name" : "unsigned long",
-   "referenced_type" : "_ZTIm",
-   "self_type" : "_ZTIm",
-   "size" : 8
-  },
-  {
-   "linker_set_key" : "_ZTIv",
-   "name" : "void",
-   "referenced_type" : "_ZTIv",
-   "self_type" : "_ZTIv"
-  }
- ],
- "elf_functions" :
- [
-  {
-   "binding" : "weak",
-   "name" : "ACgroupController_getFlags"
-  },
-  {
-   "name" : "ACgroupController_getName"
-  },
-  {
-   "name" : "ACgroupController_getPath"
-  },
-  {
-   "name" : "ACgroupController_getVersion"
-  },
-  {
-   "name" : "ACgroupFile_getController"
-  },
-  {
-   "name" : "ACgroupFile_getControllerCount"
-  },
-  {
-   "name" : "ACgroupFile_getVersion"
-  }
- ],
- "elf_objects" : [],
- "enum_types" : [],
- "function_types" : [],
- "functions" :
- [
-  {
-   "function_name" : "ACgroupController_getFlags",
-   "linker_set_key" : "ACgroupController_getFlags",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK17ACgroupController"
-    }
-   ],
-   "return_type" : "_ZTIj",
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  },
-  {
-   "function_name" : "ACgroupController_getName",
-   "linker_set_key" : "ACgroupController_getName",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK17ACgroupController"
-    }
-   ],
-   "return_type" : "_ZTIPKc",
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  },
-  {
-   "function_name" : "ACgroupController_getPath",
-   "linker_set_key" : "ACgroupController_getPath",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK17ACgroupController"
-    }
-   ],
-   "return_type" : "_ZTIPKc",
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  },
-  {
-   "function_name" : "ACgroupController_getVersion",
-   "linker_set_key" : "ACgroupController_getVersion",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK17ACgroupController"
-    }
-   ],
-   "return_type" : "_ZTIj",
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  },
-  {
-   "function_name" : "ACgroupFile_getController",
-   "linker_set_key" : "ACgroupFile_getController",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIPK17ACgroupController#ODR:out/soong/.intermediates/system/core/libprocessgroup/cgrouprc/libcgrouprc/android_x86_64_static/obj/system/core/libprocessgroup/cgrouprc/cgroup_file.sdump",
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  },
-  {
-   "function_name" : "ACgroupFile_getControllerCount",
-   "linker_set_key" : "ACgroupFile_getControllerCount",
-   "return_type" : "_ZTIj",
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  },
-  {
-   "function_name" : "ACgroupFile_getVersion",
-   "linker_set_key" : "ACgroupFile_getVersion",
-   "return_type" : "_ZTIj",
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  }
- ],
- "global_vars" : [],
- "lvalue_reference_types" : [],
- "pointer_types" :
- [
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK17ACgroupController",
-   "name" : "const ACgroupController *",
-   "referenced_type" : "_ZTIK17ACgroupController",
-   "self_type" : "_ZTIPK17ACgroupController",
-   "size" : 8,
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPK17ACgroupController",
-   "name" : "const ACgroupController *",
-   "referenced_type" : "_ZTIK17ACgroupController#ODR:out/soong/.intermediates/system/core/libprocessgroup/cgrouprc/libcgrouprc/android_x86_64_static/obj/system/core/libprocessgroup/cgrouprc/cgroup_file.sdump",
-   "self_type" : "_ZTIPK17ACgroupController#ODR:out/soong/.intermediates/system/core/libprocessgroup/cgrouprc/libcgrouprc/android_x86_64_static/obj/system/core/libprocessgroup/cgrouprc/cgroup_file.sdump",
-   "size" : 8,
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKc",
-   "name" : "const char *",
-   "referenced_type" : "_ZTIKc",
-   "self_type" : "_ZTIPKc",
-   "size" : 8,
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  }
- ],
- "qualified_types" :
- [
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIK17ACgroupController",
-   "name" : "const ACgroupController",
-   "referenced_type" : "_ZTI17ACgroupController",
-   "self_type" : "_ZTIK17ACgroupController",
-   "size" : 56,
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKc",
-   "name" : "const char",
-   "referenced_type" : "_ZTIc",
-   "self_type" : "_ZTIKc",
-   "size" : 1,
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  }
- ],
- "record_types" : [],
- "rvalue_reference_types" : []
-}
diff --git a/R/64/x86_64/source-based/libvndksupport.so.lsdump b/R/64/x86_64/source-based/libvndksupport.so.lsdump
deleted file mode 100644
index 5381ef3..0000000
--- a/R/64/x86_64/source-based/libvndksupport.so.lsdump
+++ /dev/null
@@ -1,119 +0,0 @@
-{
- "array_types" : [],
- "builtin_types" :
- [
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "linker_set_key" : "_ZTIc",
-   "name" : "char",
-   "referenced_type" : "_ZTIc",
-   "self_type" : "_ZTIc",
-   "size" : 1
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "linker_set_key" : "_ZTIi",
-   "name" : "int",
-   "referenced_type" : "_ZTIi",
-   "self_type" : "_ZTIi",
-   "size" : 4
-  },
-  {
-   "linker_set_key" : "_ZTIv",
-   "name" : "void",
-   "referenced_type" : "_ZTIv",
-   "self_type" : "_ZTIv"
-  }
- ],
- "elf_functions" :
- [
-  {
-   "name" : "android_is_in_vendor_process"
-  },
-  {
-   "name" : "android_load_sphal_library"
-  },
-  {
-   "name" : "android_unload_sphal_library"
-  }
- ],
- "elf_objects" : [],
- "enum_types" : [],
- "function_types" : [],
- "functions" :
- [
-  {
-   "function_name" : "android_is_in_vendor_process",
-   "linker_set_key" : "android_is_in_vendor_process",
-   "return_type" : "_ZTIi",
-   "source_file" : "/system/core/libvndksupport/include/vndksupport/linker.h"
-  },
-  {
-   "function_name" : "android_load_sphal_library",
-   "linker_set_key" : "android_load_sphal_library",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIPv",
-   "source_file" : "/system/core/libvndksupport/include/vndksupport/linker.h"
-  },
-  {
-   "function_name" : "android_unload_sphal_library",
-   "linker_set_key" : "android_unload_sphal_library",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPv"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "/system/core/libvndksupport/include/vndksupport/linker.h"
-  }
- ],
- "global_vars" : [],
- "lvalue_reference_types" : [],
- "pointer_types" :
- [
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPKc",
-   "name" : "const char *",
-   "referenced_type" : "_ZTIKc",
-   "self_type" : "_ZTIPKc",
-   "size" : 8,
-   "source_file" : "/system/core/libvndksupport/include/vndksupport/linker.h"
-  },
-  {
-   "alignment" : 8,
-   "linker_set_key" : "_ZTIPv",
-   "name" : "void *",
-   "referenced_type" : "_ZTIv",
-   "self_type" : "_ZTIPv",
-   "size" : 8,
-   "source_file" : "/system/core/libvndksupport/include/vndksupport/linker.h"
-  }
- ],
- "qualified_types" :
- [
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKc",
-   "name" : "const char",
-   "referenced_type" : "_ZTIc",
-   "self_type" : "_ZTIKc",
-   "size" : 1,
-   "source_file" : "/system/core/libvndksupport/include/vndksupport/linker.h"
-  }
- ],
- "record_types" : [],
- "rvalue_reference_types" : []
-}
diff --git a/R/64/x86_x86_64/source-based/libcgrouprc.so.lsdump b/R/64/x86_x86_64/source-based/libcgrouprc.so.lsdump
deleted file mode 100644
index 4059874..0000000
--- a/R/64/x86_x86_64/source-based/libcgrouprc.so.lsdump
+++ /dev/null
@@ -1,191 +0,0 @@
-{
- "array_types" : [],
- "builtin_types" :
- [
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "linker_set_key" : "_ZTIc",
-   "name" : "char",
-   "referenced_type" : "_ZTIc",
-   "self_type" : "_ZTIc",
-   "size" : 1
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "is_unsigned" : true,
-   "linker_set_key" : "_ZTIj",
-   "name" : "unsigned int",
-   "referenced_type" : "_ZTIj",
-   "self_type" : "_ZTIj",
-   "size" : 4
-  },
-  {
-   "linker_set_key" : "_ZTIv",
-   "name" : "void",
-   "referenced_type" : "_ZTIv",
-   "self_type" : "_ZTIv"
-  }
- ],
- "elf_functions" :
- [
-  {
-   "binding" : "weak",
-   "name" : "ACgroupController_getFlags"
-  },
-  {
-   "name" : "ACgroupController_getName"
-  },
-  {
-   "name" : "ACgroupController_getPath"
-  },
-  {
-   "name" : "ACgroupController_getVersion"
-  },
-  {
-   "name" : "ACgroupFile_getController"
-  },
-  {
-   "name" : "ACgroupFile_getControllerCount"
-  },
-  {
-   "name" : "ACgroupFile_getVersion"
-  }
- ],
- "elf_objects" : [],
- "enum_types" : [],
- "function_types" : [],
- "functions" :
- [
-  {
-   "function_name" : "ACgroupController_getFlags",
-   "linker_set_key" : "ACgroupController_getFlags",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK17ACgroupController"
-    }
-   ],
-   "return_type" : "_ZTIj",
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  },
-  {
-   "function_name" : "ACgroupController_getName",
-   "linker_set_key" : "ACgroupController_getName",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK17ACgroupController"
-    }
-   ],
-   "return_type" : "_ZTIPKc",
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  },
-  {
-   "function_name" : "ACgroupController_getPath",
-   "linker_set_key" : "ACgroupController_getPath",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK17ACgroupController"
-    }
-   ],
-   "return_type" : "_ZTIPKc",
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  },
-  {
-   "function_name" : "ACgroupController_getVersion",
-   "linker_set_key" : "ACgroupController_getVersion",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPK17ACgroupController"
-    }
-   ],
-   "return_type" : "_ZTIj",
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  },
-  {
-   "function_name" : "ACgroupFile_getController",
-   "linker_set_key" : "ACgroupFile_getController",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIj"
-    }
-   ],
-   "return_type" : "_ZTIPK17ACgroupController#ODR:out/soong/.intermediates/system/core/libprocessgroup/cgrouprc/libcgrouprc/android_x86_x86_64_static/obj/system/core/libprocessgroup/cgrouprc/cgroup_file.sdump",
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  },
-  {
-   "function_name" : "ACgroupFile_getControllerCount",
-   "linker_set_key" : "ACgroupFile_getControllerCount",
-   "return_type" : "_ZTIj",
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  },
-  {
-   "function_name" : "ACgroupFile_getVersion",
-   "linker_set_key" : "ACgroupFile_getVersion",
-   "return_type" : "_ZTIj",
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  }
- ],
- "global_vars" : [],
- "lvalue_reference_types" : [],
- "pointer_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK17ACgroupController",
-   "name" : "const ACgroupController *",
-   "referenced_type" : "_ZTIK17ACgroupController",
-   "self_type" : "_ZTIPK17ACgroupController",
-   "size" : 4,
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPK17ACgroupController",
-   "name" : "const ACgroupController *",
-   "referenced_type" : "_ZTIK17ACgroupController#ODR:out/soong/.intermediates/system/core/libprocessgroup/cgrouprc/libcgrouprc/android_x86_x86_64_static/obj/system/core/libprocessgroup/cgrouprc/cgroup_file.sdump",
-   "self_type" : "_ZTIPK17ACgroupController#ODR:out/soong/.intermediates/system/core/libprocessgroup/cgrouprc/libcgrouprc/android_x86_x86_64_static/obj/system/core/libprocessgroup/cgrouprc/cgroup_file.sdump",
-   "size" : 4,
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKc",
-   "name" : "const char *",
-   "referenced_type" : "_ZTIKc",
-   "self_type" : "_ZTIPKc",
-   "size" : 4,
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  }
- ],
- "qualified_types" :
- [
-  {
-   "alignment" : 4,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIK17ACgroupController",
-   "name" : "const ACgroupController",
-   "referenced_type" : "_ZTI17ACgroupController",
-   "self_type" : "_ZTIK17ACgroupController",
-   "size" : 56,
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  },
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKc",
-   "name" : "const char",
-   "referenced_type" : "_ZTIc",
-   "self_type" : "_ZTIKc",
-   "size" : 1,
-   "source_file" : "/system/core/libprocessgroup/cgrouprc/include/android/cgrouprc.h"
-  }
- ],
- "record_types" : [],
- "rvalue_reference_types" : []
-}
diff --git a/R/64/x86_x86_64/source-based/libvndksupport.so.lsdump b/R/64/x86_x86_64/source-based/libvndksupport.so.lsdump
deleted file mode 100644
index 2fce828..0000000
--- a/R/64/x86_x86_64/source-based/libvndksupport.so.lsdump
+++ /dev/null
@@ -1,119 +0,0 @@
-{
- "array_types" : [],
- "builtin_types" :
- [
-  {
-   "alignment" : 1,
-   "is_integral" : true,
-   "linker_set_key" : "_ZTIc",
-   "name" : "char",
-   "referenced_type" : "_ZTIc",
-   "self_type" : "_ZTIc",
-   "size" : 1
-  },
-  {
-   "alignment" : 4,
-   "is_integral" : true,
-   "linker_set_key" : "_ZTIi",
-   "name" : "int",
-   "referenced_type" : "_ZTIi",
-   "self_type" : "_ZTIi",
-   "size" : 4
-  },
-  {
-   "linker_set_key" : "_ZTIv",
-   "name" : "void",
-   "referenced_type" : "_ZTIv",
-   "self_type" : "_ZTIv"
-  }
- ],
- "elf_functions" :
- [
-  {
-   "name" : "android_is_in_vendor_process"
-  },
-  {
-   "name" : "android_load_sphal_library"
-  },
-  {
-   "name" : "android_unload_sphal_library"
-  }
- ],
- "elf_objects" : [],
- "enum_types" : [],
- "function_types" : [],
- "functions" :
- [
-  {
-   "function_name" : "android_is_in_vendor_process",
-   "linker_set_key" : "android_is_in_vendor_process",
-   "return_type" : "_ZTIi",
-   "source_file" : "/system/core/libvndksupport/include/vndksupport/linker.h"
-  },
-  {
-   "function_name" : "android_load_sphal_library",
-   "linker_set_key" : "android_load_sphal_library",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPKc"
-    },
-    {
-     "referenced_type" : "_ZTIi"
-    }
-   ],
-   "return_type" : "_ZTIPv",
-   "source_file" : "/system/core/libvndksupport/include/vndksupport/linker.h"
-  },
-  {
-   "function_name" : "android_unload_sphal_library",
-   "linker_set_key" : "android_unload_sphal_library",
-   "parameters" :
-   [
-    {
-     "referenced_type" : "_ZTIPv"
-    }
-   ],
-   "return_type" : "_ZTIi",
-   "source_file" : "/system/core/libvndksupport/include/vndksupport/linker.h"
-  }
- ],
- "global_vars" : [],
- "lvalue_reference_types" : [],
- "pointer_types" :
- [
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPKc",
-   "name" : "const char *",
-   "referenced_type" : "_ZTIKc",
-   "self_type" : "_ZTIPKc",
-   "size" : 4,
-   "source_file" : "/system/core/libvndksupport/include/vndksupport/linker.h"
-  },
-  {
-   "alignment" : 4,
-   "linker_set_key" : "_ZTIPv",
-   "name" : "void *",
-   "referenced_type" : "_ZTIv",
-   "self_type" : "_ZTIPv",
-   "size" : 4,
-   "source_file" : "/system/core/libvndksupport/include/vndksupport/linker.h"
-  }
- ],
- "qualified_types" :
- [
-  {
-   "alignment" : 1,
-   "is_const" : true,
-   "linker_set_key" : "_ZTIKc",
-   "name" : "const char",
-   "referenced_type" : "_ZTIc",
-   "self_type" : "_ZTIKc",
-   "size" : 1,
-   "source_file" : "/system/core/libvndksupport/include/vndksupport/linker.h"
-  }
- ],
- "record_types" : [],
- "rvalue_reference_types" : []
-}