r8s: Clean up proprietary-files list

Match Audio category name to other devices. Drop duplicate entries. Drop 32-bit libraries. Signed-off-by: CmdCtrlDevic3 <cmdctrldevic3@proton.me>
r8s: Import missing 64bit libswdap library
2026-09-13 18:18:29 +03:00 · 2026-09-12 21:04:13 +03:00 · 2026-09-07 01:58:22 +03:00
9 changed files with 251 additions and 168 deletions
@@ -21,25 +21,6 @@ cc_prebuilt_library_shared {
        none: true,
    },
    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/hw/android.hardware.bluetooth@1.0-impl-qti.so",
-            ],
-            shared_libs: [
-                "libbase",
-                "libcutils",
-                "libhidlbase",
-                "libhidltransport",
-                "liblog",
-                "libutils",
-                "vendor.samsung.hardware.bluetooth@2.0",
-                "android.hardware.bluetooth@1.0",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
        android_arm64: {
            srcs: [
                "proprietary/vendor/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so",
@@ -60,156 +41,12 @@ cc_prebuilt_library_shared {
            ],
        },
    },
-    compile_multilib: "both",
+    compile_multilib: "64",
    relative_install_path: "hw",
    prefer: true,
    soc_specific: true,
 }

-cc_prebuilt_library_shared {
-    name: "vendor.samsung.hardware.bluetooth.a2dp@1.0",
-    owner: "samsung",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/vendor.samsung.hardware.bluetooth.a2dp@1.0.so",
-            ],
-            shared_libs: [
-                "libhidlbase",
-                "liblog",
-                "libutils",
-                "libcutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/vendor.samsung.hardware.bluetooth.a2dp@1.0.so",
-            ],
-            shared_libs: [
-                "libhidlbase",
-                "liblog",
-                "libutils",
-                "libcutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "both",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "vendor.samsung.hardware.bluetooth@2.0",
-    owner: "samsung",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/vendor.samsung.hardware.bluetooth@2.0.so",
-            ],
-            shared_libs: [
-                "android.hardware.bluetooth@1.0",
-                "libhidlbase",
-                "liblog",
-                "libutils",
-                "libcutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/vendor.samsung.hardware.bluetooth@2.0.so",
-            ],
-            shared_libs: [
-                "android.hardware.bluetooth@1.0",
-                "libhidlbase",
-                "liblog",
-                "libutils",
-                "libcutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "both",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "lib_SamsungRec_07020",
-    owner: "samsung",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/lib_SamsungRec_07020.so",
-            ],
-            shared_libs: [
-                "libc",
-                "libm",
-                "libdl",
-                "liblog",
-            ],
-        },
-    },
-    compile_multilib: "32",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "libswdap",
-    owner: "samsung",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/soundfx/libswdap.so",
-            ],
-            shared_libs: [
-                "libaudioutils",
-                "libcutils",
-                "liblog",
-                "libutils",
-                "libprofileparamstorage",
-                "libspatializerparamstorage",
-                "libsecaudiocoreutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "32",
-    relative_install_path: "soundfx",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
    name: "camera.exynos990",
    owner: "samsung",
@@ -689,6 +526,95 @@ cc_prebuilt_library_shared {
    soc_specific: true,
 }

+cc_prebuilt_library_shared {
+    name: "libswdap",
+    owner: "samsung",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/soundfx/libswdap.so",
+            ],
+            shared_libs: [
+                "libaudioutils",
+                "libcutils",
+                "liblog",
+                "libutils",
+                "libprofileparamstorage",
+                "libspatializerparamstorage",
+                "libsecaudiocoreutils",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    relative_install_path: "soundfx",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "vendor.samsung.hardware.bluetooth.a2dp@1.0",
+    owner: "samsung",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/vendor.samsung.hardware.bluetooth.a2dp@1.0.so",
+            ],
+            shared_libs: [
+                "libhidlbase",
+                "liblog",
+                "libutils",
+                "libcutils",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "vendor.samsung.hardware.bluetooth@2.0",
+    owner: "samsung",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/vendor.samsung.hardware.bluetooth@2.0.so",
+            ],
+            shared_libs: [
+                "android.hardware.bluetooth@1.0",
+                "libhidlbase",
+                "liblog",
+                "libutils",
+                "libcutils",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
 android_app_import {
    name: "HotwordEnrollmentOKGoogleEx2CORTEXM4",
    owner: "samsung",
@@ -0,0 +1,157 @@
+S,1,2,1,1,1,1,1,1,2,1,3,0,1,-1,-1,-1
+AH,1,150,0
+AF,1,0,0,0,1,0,-2,-1,-1,-2,0,1,3,-1,0,100,0
+AL,1,2,7,2,-2,-1,0,1,2,0,4,4,0,-10,-12,-14,-22,-21,-8,-10,-7,-8,-4,-4,-11,50,50,40,20,20,80,80,80,100,100,100,100,250,250,250,250,250,250,250,250,250,250,250,250,8,0,1,3,-4,90,250,0,-25
+AMA,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+AMB,1,1,2,7,2,-2,-1,0,1,2,0,4,4,0,-10,-12,-14,-22,-21,-8,-10,-7,-8,-4,-4,-11,50,50,40,20,20,80,80,80,100,100,100,100,250,250,250,250,250,250,250,250,250,250,250,250,8,0,1,3,-4,90,250,0
+AMC,2,1,2,7,2,-2,-1,0,1,2,0,4,4,0,-10,-12,-14,-22,-21,-8,-10,-7,-8,-4,-4,-11,50,50,40,20,20,80,80,80,100,100,100,100,250,250,250,250,250,250,250,250,250,250,250,250,8,0,1,3,-4,90,250,0
+AMD,3,1,2,7,2,-2,-1,0,1,2,0,4,4,0,-10,-12,-14,-22,-21,-8,-10,-7,-8,-4,-4,-11,50,50,40,20,20,80,80,80,100,100,100,100,250,250,250,250,250,250,250,250,250,250,250,250,8,0,1,3,-4,90,250,0
+AME,4,1,2,7,2,-2,-1,0,1,2,0,4,4,0,-10,-12,-14,-22,-21,-8,-10,-7,-8,-4,-4,-11,50,50,40,20,20,80,80,80,100,100,100,100,250,250,250,250,250,250,250,250,250,250,250,250,8,0,1,3,-4,90,250,0
+AMF,5,1,2,7,2,-2,-1,0,1,2,0,4,4,0,-10,-12,-14,-22,-21,-8,-10,-7,-8,-4,-4,-11,50,50,40,20,20,80,80,80,100,100,100,100,250,250,250,250,250,250,250,250,250,250,250,250,8,0,1,3,-4,90,250,0
+AMG,6,1,2,7,2,-2,-1,0,1,2,0,4,4,0,-10,-12,-14,-22,-21,-8,-10,-7,-8,-4,-4,-11,50,50,40,20,20,80,80,80,100,100,100,100,250,250,250,250,250,250,250,250,250,250,250,250,8,0,1,3,-4,90,250,0
+AMH,7,1,2,7,2,-2,-1,0,1,2,0,4,4,0,-10,-12,-14,-22,-21,-8,-10,-7,-8,-4,-4,-11,50,50,40,20,20,80,80,80,100,100,100,100,250,250,250,250,250,250,250,250,250,250,250,250,8,0,1,3,-4,90,250,0
+AMI,8,1,2,7,2,-2,-1,0,1,2,0,4,4,0,-10,-12,-14,-22,-21,-8,-10,-7,-8,-4,-4,-11,50,50,40,20,20,80,80,80,100,100,100,100,250,250,250,250,250,250,250,250,250,250,250,250,8,0,1,3,-4,90,250,0
+AMJ,9,1,2,7,2,-2,-1,0,1,2,0,4,4,0,-10,-12,-14,-22,-21,-8,-10,-7,-8,-4,-4,-11,50,50,40,20,20,80,80,80,100,100,100,100,250,250,250,250,250,250,250,250,250,250,250,250,8,0,1,3,-4,90,250,0
+AMK,10,1,2,7,2,-2,-1,0,1,2,0,4,4,0,-10,-12,-14,-22,-21,-8,-10,-7,-8,-4,-4,-11,50,50,40,20,20,80,80,80,100,100,100,100,250,250,250,250,250,250,250,250,250,250,250,250,8,0,1,3,-4,90,250,0
+AML,11,1,2,7,2,-2,-1,0,1,2,0,4,4,0,-10,-12,-14,-22,-21,-8,-10,-7,-8,-4,-4,-11,50,50,40,20,20,80,80,80,100,100,100,100,250,250,250,250,250,250,250,250,250,250,250,250,8,0,1,3,-4,90,250,0
+AMM,12,1,2,7,2,-2,-1,0,1,2,0,4,4,0,-10,-12,-14,-22,-21,-8,-10,-7,-8,-4,-4,-11,50,50,40,20,20,80,80,80,100,100,100,100,250,250,250,250,250,250,250,250,250,250,250,250,8,0,1,3,-4,90,250,0
+AMN,13,1,2,7,2,-2,-1,0,1,2,0,4,4,0,-10,-12,-14,-22,-21,-8,-10,-7,-8,-4,-4,-11,50,50,40,20,20,80,80,80,100,100,100,100,250,250,250,250,250,250,250,250,250,250,250,250,8,0,1,3,-4,90,250,0
+AMO,14,1,2,7,2,-2,-1,0,1,2,0,4,4,0,-10,-12,-14,-22,-21,-8,-10,-7,-8,-4,-4,-11,50,50,40,20,20,80,80,80,100,100,100,100,250,250,250,250,250,250,250,250,250,250,250,250,8,0,1,3,-4,90,250,0
+AMP,15,1,2,7,2,-2,-1,0,1,2,0,4,4,0,-10,-12,-14,-22,-21,-8,-10,-7,-8,-4,-4,-11,50,50,40,20,20,80,80,80,100,100,100,100,250,250,250,250,250,250,250,250,250,250,250,250,8,0,1,3,-4,90,250,0
+AAA,2400,1600,-8
+AAB,950,200,-5
+AAC,700,300,-9
+AAD,6200,1000,-9
+AAE,4500,2000,2
+AAF,8500,3000,6
+AAG,300,250,3
+AAH,2700,600,-8
+AAM,1,1,1,1,1,1,1,1
+AAU,1
+ACA,2400,1600,-8
+ACB,950,200,-5
+ACC,700,300,-9
+ACD,6200,1000,-9
+ACE,4500,2000,2
+ACF,8500,3000,6
+ACG,300,250,3
+ACH,2700,600,-8
+ACM,1,1,1,1,1,1,1,1
+ACU,1
+BH,1,150,0
+BF,1,0,0,0,1,0,0,-1,-1,-2,0,1,3,-1,0,100,0
+BL,1,1,4,2,-1,-1,-1,-1,-1,-2,-3,-3,-4,-14,-13,-14,-20,-19,-14,-14,-13,-14,-11,-10,-15,80,60,20,15,15,50,50,50,50,50,50,80,250,250,250,250,250,250,250,250,250,250,250,250,9,0,1,6,-3,100,250,0,0
+BMA,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+BMB,1,1,1,4,2,-1,-1,-1,-1,-1,-2,-3,-3,-4,-14,-13,-14,-20,-19,-14,-14,-13,-14,-11,-10,-15,80,60,20,15,15,50,50,50,50,50,50,80,250,250,250,250,250,250,250,250,250,250,250,250,9,0,1,6,-3,100,250,0
+BMC,2,1,1,4,2,-1,-1,-1,-1,-1,-2,-3,-3,-4,-14,-13,-14,-20,-19,-14,-14,-13,-14,-11,-10,-15,80,60,20,15,15,50,50,50,50,50,50,80,250,250,250,250,250,250,250,250,250,250,250,250,9,0,1,6,-3,100,250,0
+BMD,3,1,1,4,2,-1,-1,-1,-1,-1,-2,-3,-3,-4,-14,-13,-14,-20,-19,-14,-14,-13,-14,-11,-10,-15,80,60,20,15,15,50,50,50,50,50,50,80,250,250,250,250,250,250,250,250,250,250,250,250,9,0,1,6,-3,100,250,0
+BME,4,1,1,4,2,-1,-1,-1,-1,-1,-2,-3,-3,-4,-14,-13,-14,-20,-19,-14,-14,-13,-14,-11,-10,-15,80,60,20,15,15,50,50,50,50,50,50,80,250,250,250,250,250,250,250,250,250,250,250,250,9,0,1,6,-3,100,250,0
+BMF,5,1,1,4,2,-1,-1,-1,-1,-1,-2,-3,-3,-4,-14,-13,-14,-20,-19,-14,-14,-13,-14,-11,-10,-15,80,60,20,15,15,50,50,50,50,50,50,80,250,250,250,250,250,250,250,250,250,250,250,250,9,0,1,6,-3,100,250,0
+BMG,6,1,1,4,2,-1,-1,-1,-1,-1,-2,-3,-3,-4,-14,-13,-14,-20,-19,-14,-14,-13,-14,-11,-10,-15,80,60,20,15,15,50,50,50,50,50,50,80,250,250,250,250,250,250,250,250,250,250,250,250,9,0,1,6,-3,100,250,0
+BMH,7,1,1,4,2,-1,-1,-1,-1,-1,-2,-3,-3,-4,-14,-13,-14,-20,-19,-14,-14,-13,-14,-11,-10,-15,80,60,20,15,15,50,50,50,50,50,50,80,250,250,250,250,250,250,250,250,250,250,250,250,9,0,1,6,-3,100,250,0
+BMI,8,1,1,4,2,-1,-1,-1,-1,-1,-2,-3,-3,-4,-14,-13,-14,-20,-19,-14,-14,-13,-14,-11,-10,-15,80,60,20,15,15,50,50,50,50,50,50,80,250,250,250,250,250,250,250,250,250,250,250,250,9,0,1,6,-3,100,250,0
+BMJ,9,1,1,4,2,-1,-1,-1,-1,-1,-2,-3,-3,-4,-14,-13,-14,-20,-19,-14,-14,-13,-14,-11,-10,-15,80,60,20,15,15,50,50,50,50,50,50,80,250,250,250,250,250,250,250,250,250,250,250,250,9,0,1,6,-3,100,250,0
+BMK,10,1,1,4,2,-1,-1,-1,-1,-1,-2,-3,-3,-4,-14,-13,-14,-20,-19,-14,-14,-13,-14,-11,-10,-15,80,60,20,15,15,50,50,50,50,50,50,80,250,250,250,250,250,250,250,250,250,250,250,250,9,0,1,6,-3,100,250,0
+BML,11,1,1,4,2,-1,-1,-1,-1,-1,-2,-3,-3,-4,-14,-13,-14,-20,-19,-14,-14,-13,-14,-11,-10,-15,80,60,20,15,15,50,50,50,50,50,50,80,250,250,250,250,250,250,250,250,250,250,250,250,9,0,1,6,-3,100,250,0
+BMM,12,1,1,4,2,-1,-1,-1,-1,-1,-2,-3,-3,-4,-14,-13,-14,-20,-19,-14,-14,-13,-14,-11,-10,-15,80,60,20,15,15,50,50,50,50,50,50,80,250,250,250,250,250,250,250,250,250,250,250,250,9,0,1,6,-3,100,250,0
+BMN,13,1,1,4,2,-1,-1,-1,-1,-1,-2,-3,-3,-4,-14,-13,-14,-20,-19,-14,-14,-13,-14,-11,-10,-15,80,60,20,15,15,50,50,50,50,50,50,80,250,250,250,250,250,250,250,250,250,250,250,250,9,0,1,6,-3,100,250,0
+BMO,14,1,1,4,2,-1,-1,-1,-1,-1,-2,-3,-3,-4,-14,-13,-14,-20,-19,-14,-14,-13,-14,-11,-10,-15,80,60,20,15,15,50,50,50,50,50,50,80,250,250,250,250,250,250,250,250,250,250,250,250,9,0,1,6,-3,100,250,0
+BMP,15,1,1,4,2,-1,-1,-1,-1,-1,-2,-3,-3,-4,-14,-13,-14,-20,-19,-14,-14,-13,-14,-11,-10,-15,80,60,20,15,15,50,50,50,50,50,50,80,250,250,250,250,250,250,250,250,250,250,250,250,9,0,1,6,-3,100,250,0
+BAA,3840,500,-7
+BAB,11500,2000,-9
+BAC,600,250,-9
+BAD,400,300,-3
+BAE,3550,1900,-11
+BAF,4400,900,-5
+BAG,850,300,-5
+BAH,300,300,-3
+BAM,1,1,1,1,1,1,1,1
+BAU,1
+BCA,3840,500,-7
+BCB,11500,2000,-9
+BCC,600,250,-9
+BCD,400,300,-3
+BCE,3550,1900,-11
+BCF,4400,900,-5
+BCG,850,300,-5
+BCH,300,300,-3
+BCM,1,1,1,1,1,1,1,1
+BCU,1
+CH,1,100,0
+CF,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0
+CL,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0
+CMA,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+CMB,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0
+CMC,2,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0
+CMD,3,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0
+CME,4,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0
+CMF,5,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0
+CMG,6,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0
+CMH,7,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0
+CMI,8,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0
+CMJ,9,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0
+CMK,10,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0
+CML,11,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0
+CMM,12,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0
+CMN,13,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0
+CMO,14,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0
+CMP,15,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0
+CAA,800,1,0
+CAB,800,1,0
+CAC,800,1,0
+CAD,800,1,0
+CAE,800,1,0
+CAF,800,1,0
+CAG,800,1,0
+CAH,800,1,0
+CAM,0,0,0,0,0,0,0,0
+CAU,0
+CCA,800,1,0
+CCB,800,1,0
+CCC,800,1,0
+CCD,800,1,0
+CCE,800,1,0
+CCF,800,1,0
+CCG,800,1,0
+CCH,800,1,0
+CCM,0,0,0,0,0,0,0,0
+CCU,0
+DH,1,100,0
+DF,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0
+DL,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0
+DMA,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+DMB,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0
+DMC,2,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0
+DMD,3,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0
+DME,4,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0
+DMF,5,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0
+DMG,6,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0
+DMH,7,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0
+DMI,8,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0
+DMJ,9,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0
+DMK,10,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0
+DML,11,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0
+DMM,12,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0
+DMN,13,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0
+DMO,14,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0
+DMP,15,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0
+DAA,800,1,0
+DAB,800,1,0
+DAC,800,1,0
+DAD,800,1,0
+DAE,800,1,0
+DAF,800,1,0
+DAG,800,1,0
+DAH,800,1,0
+DAM,0,0,0,0,0,0,0,0
+DAU,0
+DCA,800,1,0
+DCB,800,1,0
+DCC,800,1,0
+DCD,800,1,0
+DCE,800,1,0
+DCF,800,1,0
+DCG,800,1,0
+DCH,800,1,0
+DCM,0,0,0,0,0,0,0,0
+DCU,0
@@ -6,6 +6,7 @@ PRODUCT_SOONG_NAMESPACES += \
    vendor/samsung/r8s

 PRODUCT_COPY_FILES += \
+    vendor/samsung/r8s/proprietary/vendor/etc/SoundBoosterParam.txt:$(TARGET_COPY_OUT_VENDOR)/etc/SoundBoosterParam.txt \
    vendor/samsung/r8s/proprietary/vendor/etc/dolby/dax-default.xml:$(TARGET_COPY_OUT_VENDOR)/etc/dolby/dax-default.xml \
    vendor/samsung/r8s/proprietary/vendor/etc/floating_feature.xml:$(TARGET_COPY_OUT_VENDOR)/etc/floating_feature.xml \
    vendor/samsung/r8s/proprietary/vendor/etc/init/android.hardware.bluetooth@1.0-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.bluetooth@1.0-service-qti.rc \
@@ -67,10 +68,6 @@ PRODUCT_COPY_FILES += \

 PRODUCT_PACKAGES += \
    android.hardware.bluetooth@1.0-impl-qti \
-    vendor.samsung.hardware.bluetooth.a2dp@1.0 \
-    vendor.samsung.hardware.bluetooth@2.0 \
-    lib_SamsungRec_07020 \
-    libswdap \
    camera.exynos990 \
    libbauthserver \
    libbauthtzcommon \
@@ -87,6 +84,9 @@ PRODUCT_PACKAGES += \
    libwrappergps \
    sensors.grip \
    sensors.sensorhub \
+    libswdap \
+    vendor.samsung.hardware.bluetooth.a2dp@1.0 \
+    vendor.samsung.hardware.bluetooth@2.0 \
    HotwordEnrollmentOKGoogleEx2CORTEXM4 \
    HotwordEnrollmentXGoogleEx2CORTEXM4 \
    android.hardware.bluetooth@1.0-service-qti \