From 9d9c51459342d9740cb1f29b6da285255ddc9f41 Mon Sep 17 00:00:00 2001 From: SaschaNes Date: Mon, 4 Aug 2025 15:21:43 +0200 Subject: [PATCH] Revert "add some missing packages and add powerhint" This reverts commit 2f4a6aa0a28c4923ad6014abd6db6df86e506029. --- configs/powerhint.xml | 919 ------------------------------------------ device.mk | 70 +--- 2 files changed, 14 insertions(+), 975 deletions(-) delete mode 100644 configs/powerhint.xml diff --git a/configs/powerhint.xml b/configs/powerhint.xml deleted file mode 100644 index 0f20c19..0000000 --- a/configs/powerhint.xml +++ /dev/null @@ -1,919 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/device.mk b/device.mk index 54cf099..3849877 100644 --- a/device.mk +++ b/device.mk @@ -53,7 +53,6 @@ PRODUCT_PACKAGES += \ android.hardware.audio.service_64 \ pm-proxy \ secaudiohalaidl \ - audioadsprpcd \ android.hardware.bluetooth.audio-impl \ android.hardware.soundtrigger@2.3-impl \ audio.bluetooth.default \ @@ -74,7 +73,7 @@ PRODUCT_PACKAGES += \ libtinycompress \ libvolumelistener \ sound_trigger.primary.pineapple \ - vendor.qti.hardware.AGMIPC@1.0-impl + bootctrl_hal_defaults AUDIO_HAL_DIR := hardware/qcom-caf/sm8650/audio/primary-hal AUDIO_PAL_DIR := hardware/qcom-caf/sm8650/audio/pal @@ -97,11 +96,6 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.software.midi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.midi.xml # Bluetooth -PRODUCT_PACKAGES += \ - lib_bt_aptx \ - lib_bt_ble \ - lib_bt_bundle - PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.bluetooth.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.bluetooth.xml \ frameworks/native/data/etc/android.hardware.bluetooth_le.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.bluetooth_le.xml @@ -109,8 +103,7 @@ PRODUCT_COPY_FILES += \ # Boot PRODUCT_PACKAGES += \ android.hardware.boot-service.qti \ - android.hardware.boot-service.qti.recovery \ - bootctrl_hal_defaults + android.hardware.boot-service.qti.recovery # Boot animation TARGET_SCREEN_HEIGHT := 3120 @@ -192,13 +185,8 @@ PRODUCT_COPY_FILES += \ # Health PRODUCT_PACKAGES += \ - android.hardware.health-service.samsung \ - android.hardware.health-service.samsung-recovery - -# Health -# PRODUCT_PACKAGES += \ -# android.hardware.health-service.qti \ -# android.hardware.health-service.qti_recovery + android.hardware.health-service.qti \ + android.hardware.health-service.qti_recovery # HIDL PRODUCT_PACKAGES += \ @@ -227,14 +215,9 @@ PRODUCT_PACKAGES += \ # NFC PRODUCT_PACKAGES += \ - com.android.nfc_extras \ - nqnfcinfo \ + android.hardware.nfc-service.nxp \ Tag -# PRODUCT_PACKAGES += \ -# android.hardware.nfc-service.nxp \ -# Tag - PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.nfc.ese.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.ese.xml \ frameworks/native/data/etc/android.hardware.nfc.hce.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.hce.xml \ @@ -247,33 +230,13 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/com.nxp.mifare.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.nxp.mifare.xml # Overlays -# DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay +DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay PRODUCT_ENFORCE_RRO_TARGETS := * -PRODUCT_PACKAGES += \ - CarrierConfigResCommon \ - FrameworksResCommon \ - FrameworksResSamsung \ - FrameworksResTarget \ - SettingsResCommon \ - SettingsResSamsung \ - SystemUIResCommon \ - TelephonyResCommon \ - WifiResCommon \ - WifiResTarget \ - WifiResTarget_spf - # Power PRODUCT_PACKAGES += \ - android.hardware.power-service.lineage-libperfmgr \ - libqti-perfd-client - -PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/configs/powerhint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.xml - -# PRODUCT_PACKAGES += \ -# android.hardware.power-service-qti + android.hardware.power-service-qti # Partitions PRODUCT_USE_DYNAMIC_PARTITIONS := true @@ -285,10 +248,6 @@ PRODUCT_CHARACTERISTICS := phone PRODUCT_PACKAGES += \ libprotobuf-cpp-full-3.9.1-vendorcompat -# QSPA -PRODUCT_PACKAGES += \ - vendor.qti.qspa-service - # QMI PRODUCT_PACKAGES += \ libcurl.vendor \ @@ -366,9 +325,9 @@ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/rootdir/etc/fstab.qcom:$(TARGET_COPY_OUT_VENDOR_RAMDISK)/fstab.qcom # Sensors -PRODUCT_PACKAGES += \ - android.hardware.sensors-service.samsung-multihal \ - sensors.dynamic_sensor_hal +#PRODUCT_PACKAGES += \ +# android.hardware.sensors-service.samsung-multihal \ +# sensors.dynamic_sensor_hal PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/configs/hals.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/hals.conf @@ -383,13 +342,13 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.sensor.stepcounter.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.stepcounter.xml \ frameworks/native/data/etc/android.hardware.sensor.stepdetector.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.stepdetector.xml +# Shim +# PRODUCT_COPY_FILES += \ +# $(LOCAL_PATH)/rootdir/system/bin/app_process32:system/bin/app_process32 + # Soong namespaces PRODUCT_SOONG_NAMESPACES += \ $(LOCAL_PATH) \ - hardware/google/interfaces \ - hardware/google/pixel \ - hardware/lineage/interfaces/power-libperfmgr \ - hardware/qcom-caf/common/libqti-perfd-client \ hardware/samsung \ kernel/samsung/sm8650 \ kernel/samsung/sm8650-modules @@ -407,7 +366,6 @@ PRODUCT_BOOT_JARS += \ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.telephony.gsm.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/vendor.samsung.hardware.telephony.gsm.xml \ - frameworks/native/data/etc/android.hardware.telephony.ims.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.telephony.ims.xml \ frameworks/native/data/etc/android.hardware.telephony.mbms.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.telephony.mbms.xml \ frameworks/native/data/etc/android.software.sip.voip.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.sip.voip.xml