Aerodactyl: drop prebuilt vendor.mediatek.hardware.bluetooth.audio

go source built

Signed-off-by: fukiame <fukiame@proton.me>

Aerodactyl-vendor.mk

@@ -8,7 +8,6 @@ PRODUCT_SOONG_NAMESPACES += \
 PRODUCT_COPY_FILES += \
     vendor/nothing/Aerodactyl/proprietary/product/etc/sysconfig/felica-allowlist.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/felica-allowlist.xml \
     vendor/nothing/Aerodactyl/proprietary/system/etc/public.libraries-mtk.txt:$(TARGET_COPY_OUT_SYSTEM)/etc/public.libraries-mtk.txt \
-    vendor/nothing/Aerodactyl/proprietary/system/etc/sysconfig/preinstalled-packages-audioeffect.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/sysconfig/preinstalled-packages-audioeffect.xml \
     vendor/nothing/Aerodactyl/proprietary/system_ext/etc/init/init.vtservice.rc:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/init/init.vtservice.rc \
     vendor/nothing/Aerodactyl/proprietary/system_ext/etc/permissions/com.android.hotwordenrollment.common.util.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/com.android.hotwordenrollment.common.util.xml \
     vendor/nothing/Aerodactyl/proprietary/system_ext/etc/sysconfig/com.mediatek.ims.config.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/sysconfig/com.mediatek.ims.config.xml \
@@ -239,7 +238,6 @@ PRODUCT_COPY_FILES += \
     vendor/nothing/Aerodactyl/proprietary/vendor/etc/init/android.hardware.neuralnetworks-shim-service-mtk.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.neuralnetworks-shim-service-mtk.rc \
     vendor/nothing/Aerodactyl/proprietary/vendor/etc/init/android.hardware.security.keymint@2.0-service.trustonic.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.security.keymint@2.0-service.trustonic.rc \
     vendor/nothing/Aerodactyl/proprietary/vendor/etc/init/camerahalserver.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/camerahalserver.rc \
-    vendor/nothing/Aerodactyl/proprietary/vendor/etc/init/chipinfo_init.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/chipinfo_init.rc \
     vendor/nothing/Aerodactyl/proprietary/vendor/etc/init/fuelgauged_init.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/fuelgauged_init.rc \
     vendor/nothing/Aerodactyl/proprietary/vendor/etc/init/fuelgauged_nvram_init.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/fuelgauged_nvram_init.rc \
     vendor/nothing/Aerodactyl/proprietary/vendor/etc/init/init.bip_ap.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.bip_ap.rc \
@@ -636,6 +634,7 @@ PRODUCT_PACKAGES += \
     libvpu \
     libwa_opticalzoomfactor \
     libwa_sat \
+    libwifi-hal-mtk \
     libwpfa \
     libwvaidl \
     arm.graphics-V3-ndk \
@@ -986,9 +985,6 @@ PRODUCT_PACKAGES += \
     vendor.mediatek.hardware.apuware.apusys-V1-ndk \
     vendor.mediatek.hardware.apuware.utils@2.0_vendor \
     vendor.mediatek.hardware.audio@8.1 \
-    vendor.mediatek.hardware.bluetooth.audio-V1-ndk \
-    vendor.mediatek.hardware.bluetooth.audio@2.1 \
-    vendor.mediatek.hardware.bluetooth.audio@2.2 \
     vendor.mediatek.hardware.camera.aovservice-V1-ndk \
     vendor.mediatek.hardware.camera.atms@1.0 \
     vendor.mediatek.hardware.camera.bgservice@1.0 \
@@ -1120,7 +1116,6 @@ PRODUCT_PACKAGES += \
     vendor.mediatek.hardware.apuware.xrp@2.0 \
     vendor.mediatek.hardware.videotelephony-V1-ndk \
     vendor.mediatek.hardware.videotelephony@1.0 \
-    NothingAudioEffectService \
     MobileFeliCaClient \
     MobileFeliCaMenuMainApp \
     MobileFeliCaSettingApp \
@@ -1130,13 +1125,13 @@ PRODUCT_PACKAGES += \
     ImsService \
     MtkGbaService \
     MtkTelephonyAssist \
-    com.android.hotwordenrollment.common.util \
     mediatek-ims-base \
     mediatek-ims-common \
-    mediatek-ims-extension-plugin \
     mediatek-telecom-common \
     mediatek-telephony-base \
     mediatek-telephony-common \
+    com.android.hotwordenrollment.common.util \
+    mediatek-ims-extension-plugin \
     android.hardware.neuralnetworks-shim-service-mtk.xml \
     android.hardware.security.keymint-service.trustonic.xml \
     android.hardware.security.secureclock-service.trustonic.xml \
@@ -1157,7 +1152,6 @@ PRODUCT_PACKAGES += \
     bip_ap \
     ccci_mdinit \
     ccci_rpcd \
-    chipinfo \
     conninfra_loader \
     fuelgauged \
     fuelgauged_nvram \
@@ -1578,3 +1572,10 @@ PRODUCT_PACKAGES += \
     vendor_lib64_s5kjn1_mipi_raw_tuning_so \
     vendor_lib64_s5kjn1front_mipi_raw_IdxMgr_so \
     vendor_lib64_s5kjn1front_mipi_raw_tuning_so
+
+PRODUCT_BOOT_JARS += \
+    mediatek-ims-base \
+    mediatek-ims-common \
+    mediatek-telecom-common \
+    mediatek-telephony-base \
+    mediatek-telephony-common

Android.bp

@@ -7423,6 +7423,35 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "libwifi-hal-mtk",
+    owner: "nothing",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libwifi-hal-mtk.so",
+            ],
+            shared_libs: [
+                "libbase",
+                "libcutils",
+                "liblog",
+                "libnl",
+                "libutils",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "libwpfa",
     owner: "nothing",
@@ -19558,95 +19587,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "vendor.mediatek.hardware.bluetooth.audio-V1-ndk",
-    owner: "nothing",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/vendor.mediatek.hardware.bluetooth.audio-V1-ndk.so",
-            ],
-            shared_libs: [
-                "libbinder_ndk",
-                "android.hardware.common-V2-ndk",
-                "android.hardware.common.fmq-V1-ndk",
-                "android.hardware.audio.common-V1-ndk",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "vendor.mediatek.hardware.bluetooth.audio@2.1",
-    owner: "nothing",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/vendor.mediatek.hardware.bluetooth.audio@2.1.so",
-            ],
-            shared_libs: [
-                "android.hardware.audio.common@5.0",
-                "android.hidl.safe_union@1.0",
-                "libhidlbase",
-                "liblog",
-                "libutils",
-                "libcutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
-    name: "vendor.mediatek.hardware.bluetooth.audio@2.2",
-    owner: "nothing",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/vendor.mediatek.hardware.bluetooth.audio@2.2.so",
-            ],
-            shared_libs: [
-                "android.hardware.audio.common@5.0",
-                "vendor.mediatek.hardware.bluetooth.audio@2.1",
-                "android.hidl.safe_union@1.0",
-                "libhidlbase",
-                "liblog",
-                "libutils",
-                "libcutils",
-                "libc++",
-                "libc",
-                "libm",
-                "libdl",
-            ],
-        },
-    },
-    compile_multilib: "64",
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "vendor.mediatek.hardware.camera.aovservice-V1-ndk",
     owner: "nothing",
@@ -23567,17 +23507,6 @@ cc_prebuilt_library_shared {
     system_ext_specific: true,
 }
 
-android_app_import {
-    name: "NothingAudioEffectService",
-    owner: "nothing",
-    apk: "proprietary/system/priv-app/NothingAudioEffectService/NothingAudioEffectService.apk",
-    certificate: "platform",
-    dex_preopt: {
-        enabled: false,
-    },
-    privileged: true,
-}
-
 android_app_import {
     name: "MobileFeliCaClient",
     owner: "nothing",
@@ -23686,6 +23615,46 @@ android_app_import {
     system_ext_specific: true,
 }
 
+dex_import {
+    name: "mediatek-ims-base",
+    owner: "nothing",
+    jars: [
+        "proprietary/system/framework/mediatek-ims-base.jar",
+    ],
+}
+
+dex_import {
+    name: "mediatek-ims-common",
+    owner: "nothing",
+    jars: [
+        "proprietary/system/framework/mediatek-ims-common.jar",
+    ],
+}
+
+dex_import {
+    name: "mediatek-telecom-common",
+    owner: "nothing",
+    jars: [
+        "proprietary/system/framework/mediatek-telecom-common.jar",
+    ],
+}
+
+dex_import {
+    name: "mediatek-telephony-base",
+    owner: "nothing",
+    jars: [
+        "proprietary/system/framework/mediatek-telephony-base.jar",
+    ],
+}
+
+dex_import {
+    name: "mediatek-telephony-common",
+    owner: "nothing",
+    jars: [
+        "proprietary/system/framework/mediatek-telephony-common.jar",
+    ],
+}
+
 dex_import {
     name: "com.android.hotwordenrollment.common.util",
     owner: "nothing",
@@ -23695,24 +23664,6 @@ dex_import {
     system_ext_specific: true,
 }
 
-dex_import {
-    name: "mediatek-ims-base",
-    owner: "nothing",
-    jars: [
-        "proprietary/system_ext/framework/mediatek-ims-base.jar",
-    ],
-    system_ext_specific: true,
-}
-
-dex_import {
-    name: "mediatek-ims-common",
-    owner: "nothing",
-    jars: [
-        "proprietary/system_ext/framework/mediatek-ims-common.jar",
-    ],
-    system_ext_specific: true,
-}
-
 dex_import {
     name: "mediatek-ims-extension-plugin",
     owner: "nothing",
@@ -23722,33 +23673,6 @@ dex_import {
     system_ext_specific: true,
 }
 
-dex_import {
-    name: "mediatek-telecom-common",
-    owner: "nothing",
-    jars: [
-        "proprietary/system_ext/framework/mediatek-telecom-common.jar",
-    ],
-    system_ext_specific: true,
-}
-
-dex_import {
-    name: "mediatek-telephony-base",
-    owner: "nothing",
-    jars: [
-        "proprietary/system_ext/framework/mediatek-telephony-base.jar",
-    ],
-    system_ext_specific: true,
-}
-
-dex_import {
-    name: "mediatek-telephony-common",
-    owner: "nothing",
-    jars: [
-        "proprietary/system_ext/framework/mediatek-telephony-common.jar",
-    ],
-    system_ext_specific: true,
-}
-
 prebuilt_etc_xml {
     name: "android.hardware.neuralnetworks-shim-service-mtk.xml",
     owner: "nothing",
@@ -23988,14 +23912,6 @@ cc_prebuilt_binary {
     soc_specific: true,
 }
 
-sh_binary {
-    name: "chipinfo",
-    owner: "nothing",
-    src: "proprietary/vendor/bin/chipinfo",
-    filename: "chipinfo",
-    soc_specific: true,
-}
-
 cc_prebuilt_binary {
     name: "conninfra_loader",
     owner: "nothing",

proprietary/system/etc/sysconfig/preinstalled-packages-audioeffect.xml

@@ -1,20 +0,0 @@
-<!--
-  ~ Copyright (C) 2021 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-<config>
-    <install-in-user-type package="com.nothing.audioeffect">
-        <install-in user-type="SYSTEM"/>
-    </install-in-user-type>
-</config>

proprietary/vendor/bin/chipinfo

@@ -1,31 +0,0 @@
-#!/vendor/bin/sh
-
-default_fact_prop=$(getprop ro.soc.manufacturer)
-
-if [ "$default_fact_prop" == "" ]; then
-	fact_val=$(cat /sys/devices/soc0/family)
-	/vendor/bin/setprop ro.vendor.soc.manufacturer ${fact_val}
-fi
-
-default_soc_prop=$(getprop ro.soc.model)
-
-if [ "$default_soc_prop" == "" ]; then
-	soc_val=$(cat /sys/devices/soc0/soc_id)
-	/vendor/bin/setprop ro.vendor.soc.model ${soc_val}
-else
-	soc_val="$default_soc_prop"
-fi
-
-soc_ext_val=$(cat /proc/device-tree/model-external-name 2>/dev/null)
-if [ -z "$soc_ext_val" ]; then
-	soc_ext_val=${soc_val}
-fi
-/vendor/bin/setprop ro.vendor.soc.model.external_name ${soc_ext_val}
-
-soc_part_val=$(cat /proc/device-tree/model-part-name 2>/dev/null)
-if [ -z "$soc_part_val" ]; then
-        soc_part_val=${soc_val}
-fi
-/vendor/bin/setprop ro.vendor.soc.model.part_name ${soc_part_val}
-
-/vendor/bin/setprop ro.vendor.soc.model_ready 1

proprietary/vendor/etc/displayconfig/display_id_4627039422300187648.xml

@@ -50,7 +50,7 @@
         </point>
     </screenBrightnessMap>
     <highBrightnessMode enabled="true">
-        <transitionPoint>0.6</transitionPoint>
+        <transitionPoint>0.9221</transitionPoint>
         <minimumLux>7500.0</minimumLux>
         <timing>
             <!-- allow for 5 minutes out of every 30 minutes -->

proprietary/vendor/etc/init/chipinfo_init.rc

@@ -1,7 +0,0 @@
-on early-init
-    exec_background - system system -- /vendor/bin/chipinfo
-
-on post-fs-data
-    wait_for_prop ro.vendor.soc.model_ready 1
-    setprop ro.soc.model ${ro.vendor.soc.model}
-    setprop ro.soc.manufacturer ${ro.vendor.soc.manufacturer}