Aerodactyl: Sync with device tree changes

Aerodactyl-vendor.mk

@@ -415,7 +415,6 @@ PRODUCT_PACKAGES += \
     android.hardware.gnss-impl-mediatek \
     android.hardware.gnss@2.1-impl-mediatek \
     audio.primary.mediatek \
-    audio.r_submix.mediatek \
     fingerprint.mt6886 \
     gps.default \
     hwcomposer.mtk_common \
@@ -629,7 +628,6 @@ PRODUCT_PACKAGES += \
     librgbwlightsensor \
     librilfusion \
     librpc \
-    librt_extamp_intf \
     libscltm \
     libsensor_extension \
     libsimlock \
@@ -638,6 +636,7 @@ PRODUCT_PACKAGES += \
     libstorage_otp \
     libsysenv \
     libtflite_mtk \
+    libtinyxml2-bp2a \
     libtranslator_mapi_v3.0 \
     libtranslator_mdmi_v2.8.2 \
     libtranslator_utils \
@@ -1215,7 +1214,6 @@ PRODUCT_PACKAGES += \
     vendor_bin_jpegtool \
     vendor_lib64_egl_libGLES_mali_so \
     vendor_lib64_hw_audio_primary_mt6886_so \
-    vendor_lib64_hw_audio_r_submix_mt6886_so \
     vendor_lib64_hw_gatekeeper_trustonic_so \
     vendor_lib64_hw_gatekeeper_default_so \
     vendor_lib64_hw_android_hardware_graphics_allocator@4_0-impl-mediatek_so \

Android.bp

@@ -409,7 +409,7 @@ cc_prebuilt_library_shared {
                 "libhardware",
                 "libaudioutils",
                 "libtinyalsa",
-                "libtinyxml2",
+                "libtinyxml2-bp2a",
                 "libaudiotoolkit_vendor",
                 "libmedia_helper",
                 "libladder",
@@ -444,36 +444,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "audio.r_submix.mediatek",
-    owner: "nothing",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/hw/audio.r_submix.mediatek.so",
-            ],
-            shared_libs: [
-                "liblog",
-                "libcutils",
-                "libmedia_helper",
-                "libutils",
-                "libnbaio_mono",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    relative_install_path: "hw",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "fingerprint.mt6886",
     owner: "nothing",
@@ -935,7 +905,7 @@ cc_prebuilt_library_shared {
                 "libcutils",
                 "libpq_prot",
                 "libhidlmemory",
-                "libtinyxml2",
+                "libtinyxml2-bp2a",
                 "vendor.mediatek.hardware.pq_aidl-V1-ndk",
                 "libbinder_ndk",
                 "libbinder",
@@ -6407,7 +6377,7 @@ cc_prebuilt_library_shared {
                 "libutils",
                 "libcutils",
                 "liblog",
-                "libtinyxml2",
+                "libtinyxml2-bp2a",
                 "libc++",
                 "libc",
                 "libm",
@@ -6726,39 +6696,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "librt_extamp_intf",
-    owner: "nothing",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/librt_extamp_intf.so",
-            ],
-            shared_libs: [
-                "libcutils",
-                "libutils",
-                "libtinyalsa",
-                "libtinyxml2",
-                "liblog",
-                "libnvram",
-                "libcrypto",
-                "libssl",
-                "libfile_op",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libscltm",
     owner: "nothing",
@@ -6975,6 +6912,31 @@ 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",
@@ -14678,7 +14640,7 @@ cc_prebuilt_library_shared {
                 "libhidlmemory",
                 "libpqsharememory",
                 "libpq_prot",
-                "libtinyxml2",
+                "libtinyxml2-bp2a",
                 "libpqxmlparser",
                 "vendor.mediatek.hardware.mmlpq-V2-ndk",
                 "libbinder_ndk",
@@ -24467,13 +24429,6 @@ install_symlink {
     symlink_target: "/vendor/lib64/hw/audio.primary.mediatek.so",
 }
 
-install_symlink {
-    name: "vendor_lib64_hw_audio_r_submix_mt6886_so",
-    soc_specific: true,
-    installed_location: "lib64/hw/audio.r_submix.mt6886.so",
-    symlink_target: "/vendor/lib64/hw/audio.r_submix.mediatek.so",
-}
-
 install_symlink {
     name: "vendor_lib64_hw_gatekeeper_trustonic_so",
     soc_specific: true,