Aerodactyl: Sync patches for QPR2

Aerodactyl-vendor.mk

@@ -634,7 +634,6 @@ PRODUCT_PACKAGES += \
     libstorage_otp \
     libsysenv \
     libtflite_mtk_vendor \
-    libtinyxml2-bp2a \
     libtranslator_mapi_v3.0 \
     libtranslator_mdmi_v2.8.2 \
     libtranslator_utils \

Android.bp

@@ -289,7 +289,7 @@ cc_prebuilt_library_shared {
                 "libhardware",
                 "libaudioutils",
                 "libtinyalsa",
-                "libtinyxml2-bp2a",
+                "libtinyxml2-v34",
                 "libaudiotoolkit_vendor",
                 "libmedia_helper",
                 "libladder",
@@ -785,7 +785,7 @@ cc_prebuilt_library_shared {
                 "libcutils",
                 "libpq_prot",
                 "libhidlmemory",
-                "libtinyxml2-bp2a",
+                "libtinyxml2-v34",
                 "vendor.mediatek.hardware.pq_aidl-V1-ndk",
                 "libbinder_ndk",
                 "libbinder",
@@ -2851,6 +2851,7 @@ cc_prebuilt_library_shared {
                 "proprietary/vendor/lib64/libcodec2_hidl@1.0-v33.so",
             ],
             shared_libs: [
+                "libbase_shim",
                 "android.hardware.graphics.bufferqueue@1.0",
                 "android.hardware.graphics.bufferqueue@2.0",
                 "android.hardware.graphics.common@1.0",
@@ -2893,6 +2894,7 @@ cc_prebuilt_library_shared {
                 "proprietary/vendor/lib64/libcodec2_hidl@1.1-v33.so",
             ],
             shared_libs: [
+                "libbase_shim",
                 "android.hardware.graphics.bufferqueue@1.0",
                 "android.hardware.graphics.bufferqueue@2.0",
                 "android.hardware.graphics.common@1.0",
@@ -2937,6 +2939,7 @@ cc_prebuilt_library_shared {
                 "proprietary/vendor/lib64/libcodec2_hidl@1.2-v33.so",
             ],
             shared_libs: [
+                "libbase_shim",
                 "android.hardware.graphics.bufferqueue@1.0",
                 "android.hardware.graphics.bufferqueue@2.0",
                 "android.hardware.graphics.common@1.0",
@@ -6410,7 +6413,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcutils",
                 "liblog",
-                "libtinyxml2-bp2a",
+                "libtinyxml2-v34",
                 "libc++",
                 "libc",
                 "libm",
@@ -6996,6 +6999,7 @@ cc_prebuilt_library_shared {
                 "proprietary/vendor/lib64/libtflite_mtk.so",
             ],
             shared_libs: [
+                "libbase_shim",
                 "liblog",
                 "libflatbuffers-cpp",
                 "libruy",
@@ -7013,31 +7017,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libtinyxml2-bp2a",
-    owner: "nothing",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libtinyxml2-bp2a.so",
-            ],
-            shared_libs: [
-                "liblog",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libtranslator_mapi_v3.0",
     owner: "nothing",
@@ -14688,7 +14667,7 @@ cc_prebuilt_library_shared {
                 "libhidlmemory",
                 "libpqsharememory",
                 "libpq_prot",
-                "libtinyxml2-bp2a",
+                "libtinyxml2-v34",
                 "libpqxmlparser",
                 "vendor.mediatek.hardware.mmlpq-V2-ndk",
                 "libbinder_ndk",