diff --git a/device.mk b/device.mk index ebc9d1d..e895178 100644 --- a/device.mk +++ b/device.mk @@ -58,7 +58,7 @@ PRODUCT_PACKAGES += \ # ANT+ PRODUCT_PACKAGES += \ - com.dsi.ant@1.0.vendor + com.dsi.ant@1.0.vendor:64 # Audio SOONG_CONFIG_NAMESPACES += android_hardware_audio @@ -66,26 +66,26 @@ SOONG_CONFIG_android_hardware_audio += run_64bit SOONG_CONFIG_android_hardware_audio_run_64bit := true PRODUCT_PACKAGES += \ - android.hardware.audio@7.0-impl \ - android.hardware.audio.effect@7.0-impl \ + android.hardware.audio@7.0-impl:64 \ + android.hardware.audio.effect@7.0-impl:64 \ android.hardware.audio.service \ - android.hardware.soundtrigger@2.3-impl + android.hardware.soundtrigger@2.3-impl:64 PRODUCT_PACKAGES += \ - audio.bluetooth.default \ - audio.r_submix.default \ - audio.usb.default \ - sound_trigger.primary.parrot + audio.bluetooth.default:64 \ + audio.r_submix.default:64 \ + audio.usb.default:64 \ + sound_trigger.primary.parrot:64 PRODUCT_PACKAGES += \ audioadsprpcd PRODUCT_PACKAGES += \ - libqcompostprocbundle \ - libqcomvisualizer \ - libqcomvoiceprocessing \ - libsndcardparser \ - libvolumelistener + libqcompostprocbundle:64 \ + libqcomvisualizer:64 \ + libqcomvoiceprocessing:64 \ + libsndcardparser:64 \ + libvolumelistener:64 PRODUCT_COPY_FILES += \ frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ @@ -102,11 +102,11 @@ PRODUCT_COPY_FILES += \ # Bluetooth PRODUCT_PACKAGES += \ - android.hardware.bluetooth@1.0.vendor \ - android.hardware.bluetooth.audio-impl \ - vendor.qti.hardware.bluetooth_audio@2.1.vendor \ - vendor.qti.hardware.btconfigstore@1.0.vendor \ - vendor.qti.hardware.btconfigstore@2.0.vendor + android.hardware.bluetooth@1.0.vendor:64 \ + android.hardware.bluetooth.audio-impl:64 \ + vendor.qti.hardware.bluetooth_audio@2.1.vendor:64 \ + vendor.qti.hardware.btconfigstore@1.0.vendor:64 \ + vendor.qti.hardware.btconfigstore@2.0.vendor:64 PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.bluetooth.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.bluetooth.xml \ @@ -117,8 +117,8 @@ TARGET_BOOT_ANIMATION_RES := 1080 # Boot control PRODUCT_PACKAGES += \ - android.hardware.boot@1.2-impl-qti \ - android.hardware.boot@1.2-impl-qti.recovery \ + android.hardware.boot@1.2-impl-qti:64 \ + android.hardware.boot@1.2-impl-qti.recovery:64 \ android.hardware.boot@1.2-service \ bootctrl.parrot \ bootctrl.parrot.recovery @@ -128,13 +128,13 @@ PRODUCT_PACKAGES_DEBUG += \ # Camera PRODUCT_PACKAGES += \ - android.hardware.camera.provider@2.7.vendor \ - libcamera_metadata.vendor \ - libexif.vendor \ - libpiex.vendor \ - libutilscallstack.vendor \ - libyuv.vendor \ - vendor.qti.hardware.camera.postproc@1.0.vendor + android.hardware.camera.provider@2.7.vendor:64 \ + libcamera_metadata.vendor:64 \ + libexif.vendor:64 \ + libpiex.vendor:64 \ + libutilscallstack.vendor:64 \ + libyuv.vendor:64 \ + vendor.qti.hardware.camera.postproc@1.0.vendor:64 PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.camera.flash-autofocus.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.flash-autofocus.xml \ @@ -144,7 +144,7 @@ PRODUCT_COPY_FILES += \ # Capabilityconfigstore PRODUCT_PACKAGES += \ - vendor.qti.hardware.capabilityconfigstore@1.0.vendor + vendor.qti.hardware.capabilityconfigstore@1.0.vendor:64 # Dalvik heap PRODUCT_PROPERTY_OVERRIDES += \ @@ -185,13 +185,13 @@ PRODUCT_COPY_FILES += \ # DRM PRODUCT_PACKAGES += \ - android.hardware.drm@1.4.vendor \ + android.hardware.drm@1.4.vendor:64 \ android.hardware.drm-service.clearkey \ - libdrm.vendor + libdrm.vendor:64 # Dumpstate PRODUCT_PACKAGES += \ - android.hardware.dumpstate@1.1.vendor + android.hardware.dumpstate@1.1.vendor:64 # Fastbootd PRODUCT_PACKAGES += \ @@ -221,20 +221,20 @@ PRODUCT_PACKAGES += \ # Gatekeeper PRODUCT_PACKAGES += \ - android.hardware.gatekeeper@1.0.vendor + android.hardware.gatekeeper@1.0.vendor:64 # GPS PRODUCT_PACKAGES += \ - android.hardware.gnss@2.1.vendor \ - android.hardware.power@1.2.vendor \ - libgrpc++_unsecure.vendor + android.hardware.gnss@2.1.vendor:64 \ + android.hardware.power@1.2.vendor:64 \ + libgrpc++_unsecure.vendor:64 PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.location.gps.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.location.gps.xml # Graphics PRODUCT_PACKAGES += \ - libgui_vendor + libgui_vendor:64 PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.opengles.aep.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.opengles.aep.xml \ @@ -251,10 +251,10 @@ PRODUCT_PACKAGES += \ # HIDL PRODUCT_PACKAGES += \ - android.hidl.allocator@1.0.vendor \ - android.hidl.memory.block@1.0.vendor \ - libhidltransport.vendor \ - libhwbinder.vendor + android.hidl.allocator@1.0.vendor:64 \ + android.hidl.memory.block@1.0.vendor:64 \ + libhidltransport.vendor:64 \ + libhwbinder.vendor:64 # Hotword Enrollement PRODUCT_COPY_FILES += \ @@ -275,7 +275,7 @@ PRODUCT_PACKAGES += \ # IR PRODUCT_PACKAGES += \ - android.hardware.ir@1.0-impl \ + android.hardware.ir@1.0-impl:64 \ android.hardware.ir@1.0-service PRODUCT_COPY_FILES += \ @@ -283,19 +283,19 @@ PRODUCT_COPY_FILES += \ # JSON PRODUCT_PACKAGES += \ - libcurl.vendor \ - libjson \ - libjsoncpp.vendor \ - libsqlite.vendor + libcurl.vendor:64 \ + libjson:64 \ + libjsoncpp.vendor:64 \ + libsqlite.vendor:64 # Keymaster PRODUCT_PACKAGES += \ - android.hardware.keymaster@4.1.vendor \ - libkeymaster_messages.vendor + android.hardware.keymaster@4.1.vendor:64 \ + libkeymaster_messages.vendor:64 # Keymint PRODUCT_PACKAGES += \ - android.hardware.security.rkp-V1-ndk.vendor + android.hardware.security.rkp-V1-ndk.vendor:64 PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.software.device_id_attestation.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.device_id_attestation.xml @@ -306,9 +306,9 @@ PRODUCT_PACKAGES += \ # Media PRODUCT_PACKAGES += \ - libavservices_minijail.vendor \ - libcodec2_hidl@1.0.vendor \ - libsfplugin_ccodec_utils.vendor + libavservices_minijail.vendor:64 \ + libcodec2_hidl@1.0.vendor:64 \ + libsfplugin_ccodec_utils.vendor:64 # Mlipay PRODUCT_PACKAGES += \ @@ -318,8 +318,8 @@ PRODUCT_PACKAGES += \ # NFC PRODUCT_PACKAGES += \ NfcNci \ - android.hardware.nfc@1.2.vendor \ - libchrome.vendor + android.hardware.nfc@1.2.vendor:64 \ + libchrome.vendor:64 PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.nfc.hce.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_hcesim/android.hardware.nfc.hce.xml \ @@ -379,7 +379,7 @@ PRODUCT_USE_DYNAMIC_PARTITIONS := true # Perf PRODUCT_PACKAGES += \ - vendor.qti.hardware.perf@2.3.vendor + vendor.qti.hardware.perf@2.3.vendor:64 # Power PRODUCT_PACKAGES += \ @@ -399,16 +399,16 @@ include $(DEVICE_PATH)/configs/properties/default.mk # QTI PRODUCT_PACKAGES += \ - vendor.qti.hardware.systemhelper@1.0.vendor + vendor.qti.hardware.systemhelper@1.0.vendor:64 # RenderScript PRODUCT_PACKAGES += \ - android.hardware.renderscript@1.0-impl + android.hardware.renderscript@1.0-impl:64 # RIL PRODUCT_PACKAGES += \ - android.hardware.radio.config@1.3.vendor \ - android.hardware.radio.deprecated@1.0.vendor + android.hardware.radio.config@1.3.vendor:64 \ + android.hardware.radio.deprecated@1.0.vendor:64 PRODUCT_PACKAGES += \ librmnetctl @@ -442,7 +442,7 @@ PRODUCT_PACKAGES += \ # Secure element PRODUCT_PACKAGES += \ - android.hardware.secure_element@1.2.vendor + android.hardware.secure_element@1.2.vendor:64 PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.se.omapi.ese.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_hceese/android.hardware.se.omapi.ese.xml \ @@ -465,9 +465,9 @@ PRODUCT_COPY_FILES += \ # Sensors PRODUCT_PACKAGES += \ android.frameworks.sensorservice@1.0 \ - android.frameworks.sensorservice@1.0.vendor \ + android.frameworks.sensorservice@1.0.vendor:64 \ android.hardware.sensors@2.1-service.xiaomi-multihal \ - libsensorndkbridge + libsensorndkbridge:64 PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.sensor.accelerometer.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/sku_ravelin/android.hardware.sensor.accelerometer.xml \ @@ -480,7 +480,7 @@ PRODUCT_COPY_FILES += \ # Servicetracker PRODUCT_PACKAGES += \ - vendor.qti.hardware.servicetracker@1.2.vendor + vendor.qti.hardware.servicetracker@1.2.vendor:64 # SHIPPING API PRODUCT_SHIPPING_API_LEVEL := 31 @@ -588,9 +588,9 @@ PRODUCT_PACKAGES += \ android.hardware.wifi-service \ android.hardware.wifi.hostapd@1.0.vendor \ wpa_cli \ - libwpa_client \ + libwpa_client:64 \ hostapd \ - libwifi-hal-qcom \ + libwifi-hal-qcom:64 \ wpa_supplicant \ wpa_supplicant.conf diff --git a/proprietary-files.txt b/proprietary-files.txt index 98195bf..1665a76 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -70,8 +70,6 @@ vendor/bin/agmplay vendor/bin/cplay vendor/bin/hw/vendor.qti.hardware.AGMIPC@1.0-service vendor/etc/init/vendor.qti.hardware.AGMIPC@1.0-service.rc --vendor/lib/libagm.so --vendor/lib/vendor.qti.hardware.AGMIPC@1.0-impl.so -vendor/lib64/libagm.so vendor/lib64/libagm_compress_plugin.so vendor/lib64/libagm_mixer_plugin.so @@ -85,7 +83,6 @@ vendor/lib64/vendor.qti.hardware.AGMIPC@1.0.so vendor/etc/models/acd/event.eai vendor/etc/models/acd/music.eai vendor/etc/models/acd/speech.eai --vendor/lib/libar-pal.so vendor/lib64/hw/audio.primary.parrot.so vendor/lib64/libadm.so vendor/lib64/libadsprpc.so @@ -546,10 +543,6 @@ vendor/firmware/evass.mdt # CDSP vendor/bin/cdsprpcd vendor/etc/init/vendor.qti.cdsprpc-service.rc -vendor/lib/libcdsp_default_listener.so -vendor/lib/libcdsprpc.so -vendor/lib/libmdsprpc.so -vendor/lib/libsdsprpc.so vendor/lib64/libcdsp_default_listener.so vendor/lib64/libcdsprpc.so vendor/lib64/libmdsprpc.so @@ -782,9 +775,7 @@ vendor/lib64/vendor.qti.esepowermanager@1.0.so vendor/lib64/vendor.qti.esepowermanager@1.1.so # Fingerprint -system_ext/lib/vendor.xiaomi.hardware.fingerprintextension@1.0.so system_ext/lib64/vendor.xiaomi.hardware.fingerprintextension@1.0.so -vendor/lib/vendor.qti.hardware.fingerprint@1.0.so vendor/lib64/hw/fingerprint.fpc.so:vendor/lib64/hw/fingerprint.fpc.default.so vendor/lib64/hw/fingerprint.goodix.so:vendor/lib64/hw/fingerprint.goodix.default.so vendor/lib64/com.fingerprints.extension@1.0.so @@ -801,15 +792,12 @@ system_ext/lib64/libfm-hci.so system_ext/lib64/vendor.qti.hardware.fm@1.0.so vendor/etc/init/init.qti.fm.rc vendor/etc/init.qti.fm.sh -vendor/lib/hw/vendor.qti.hardware.fm@1.0-impl.so -vendor/lib/vendor.qti.hardware.fm@1.0.so vendor/lib64/hw/vendor.qti.hardware.fm@1.0-impl.so vendor/lib64/vendor.qti.hardware.fm@1.0.so # Gatekeeper vendor/bin/hw/android.hardware.gatekeeper@1.0-service-qti vendor/etc/init/android.hardware.gatekeeper@1.0-service-qti.rc -vendor/lib/hw/android.hardware.gatekeeper@1.0-impl-qti.so vendor/lib64/hw/android.hardware.gatekeeper@1.0-impl-qti.so # GNSS @@ -1027,7 +1015,6 @@ system_ext/lib64/vendor.qti.ims.rcsuceaidlservice-V1-ndk.so system_ext/lib64/vendor.qti.ImsRtpService-V1-ndk.so # IR -vendor/lib/hw/consumerir.default.so vendor/lib64/hw/consumerir.default.so # IRQ balance @@ -1045,11 +1032,6 @@ vendor/etc/init/hw/init.qti.kernel.rc # Keymaster vendor/bin/hw/android.hardware.keymaster@4.1-service-qti vendor/etc/init/android.hardware.keymaster@4.1-service-qti.rc -vendor/lib/libkeymasterdeviceutils.so -vendor/lib/libkeymasterprovision.so -vendor/lib/libkeymasterutils.so -vendor/lib/libqcbor.so -vendor/lib/libqtikeymaster4.so vendor/lib64/libkeymasterdeviceutils.so vendor/lib64/libkeymasterprovision.so vendor/lib64/libkeymasterutils.so @@ -1061,7 +1043,6 @@ vendor/bin/hw/android.hardware.security.keymint-service-qti vendor/etc/init/android.hardware.security.keymint-service-qti.rc vendor/etc/permissions/android.hardware.hardware_keystore.xml vendor/etc/vintf/manifest/android.hardware.security.keymint-service-qti-rkp.xml -vendor/lib/libqtikeymint.so vendor/lib64/libqtikeymint.so # Media @@ -1091,30 +1072,6 @@ vendor/etc/media_profiles_V1_0.xml vendor/etc/media_profiles_ravelin.xml vendor/etc/microphone_characteristics.xml vendor/etc/usecaseKvManager.xml -vendor/lib/libEvrcSwCodec.so -vendor/lib/libQcelp13SwCodec.so -vendor/lib/libqc2audio_base.so -vendor/lib/libqc2audio_basecodec.so -vendor/lib/libqc2audio_core.so -vendor/lib/libqc2audio_hooks.so -vendor/lib/libqc2audio_hwaudiocodec.so -vendor/lib/libqc2audio_platform.so -vendor/lib/libqc2audio_swaudiocodec.so -vendor/lib/libqc2audio_utils.so -vendor/lib/libqc2colorconvertfilter.so -vendor/lib/libqc2filter.so -vendor/lib/libqcodec2_base.so -vendor/lib/libqcodec2_basecodec.so -vendor/lib/libqcodec2_core.so -vendor/lib/libqcodec2_filterbase.so -vendor/lib/libqcodec2_hooks.so -vendor/lib/libqcodec2_mockfilter.so -vendor/lib/libqcodec2_mockqc2filter.so -vendor/lib/libqcodec2_platform.so -vendor/lib/libqcodec2_utils.so -vendor/lib/libqcodec2_v4l2codec.so -vendor/lib/libvideotxr.so -vendor/lib/qti.video.utils.videobufferlayout.so vendor/lib64/libEvrcSwCodec.so vendor/lib64/libQcelp13SwCodec.so vendor/lib64/libqc2audio_base.so @@ -1184,8 +1141,6 @@ vendor/etc/sn100u_pnx_ese_sn.pnscr vendor/etc/sn100u_pnx_ndi.pnscr vendor/etc/sn100u_pnx_pcv.pnscr vendor/etc/sn100u_pnx_sst.pnscr -vendor/lib/nfc_nci.nqx.default.hw.so -vendor/lib/vendor.nxp.hardware.nfc@2.0.so vendor/lib64/nfc_nci.nqx.default.hw.so vendor/lib64/libsn100u_fw.so vendor/lib64/libsn100u_fw_cn.so @@ -1193,17 +1148,9 @@ vendor/lib64/libsn100u_fw_jp.so vendor/lib64/libsn220u_fw.so vendor/lib64/vendor.nxp.hardware.nfc@2.0.so -# OMX -vendor/lib64/libAlacSwDec.so -vendor/lib64/libApeSwDec.so -vendor/lib64/libFlacSwDec.so -vendor/lib64/libdsd2pcm.so - # Peripheral manager vendor/bin/pm-proxy vendor/bin/pm-service -vendor/lib/libperipheral_client.so -vendor/lib/libspcom.so vendor/lib64/libperipheral_client.so vendor/lib64/libspcom.so @@ -1226,7 +1173,6 @@ vendor/lib64/vendor.qti.hardware.qccvndhal@1.0.so # QCOM system daemon vendor/bin/qcom-system-daemon -vendor/lib/libsubsystem_control.so vendor/lib64/libsubsystem_control.so # QCV @@ -1278,12 +1224,6 @@ vendor/bin/qtisetprop vendor/lib64/libsoc_helper.so vendor/lib64/libsoc_helper_jni.so -# QTI service tracker -vendor/bin/hw/vendor.qti.hardware.servicetracker@1.2-service -vendor/etc/init/vendor.qti.hardware.servicetracker@1.2-service.rc -vendor/etc/vintf/manifest/vendor.qti.hardware.servicetracker@1.2-service.xml -vendor/lib64/hw/vendor.qti.hardware.servicetracker@1.2-impl.so - # RIL - from salami OOS 11.C.51 vendor/lib64/libqcrilNrSmsModule.so|eec750187d50e0c6df179d10bd656ee026259f86 @@ -1384,14 +1324,6 @@ vendor/etc/vintf/manifest/dataconnection-saidl.xml vendor/etc/vintf/manifest/qtiradio-saidl.xml vendor/etc/vintf/manifest/vendor.qti.hardware.radio.ims.xml vendor/etc/telephony_packages.xml -vendor/lib/com.qualcomm.qti.imscmservice@1.0.so -vendor/lib/com.qualcomm.qti.imscmservice@2.0.so -vendor/lib/com.qualcomm.qti.imscmservice@2.1.so -vendor/lib/com.qualcomm.qti.imscmservice@2.2.so -vendor/lib/com.qualcomm.qti.uceservice@2.0.so -vendor/lib/com.qualcomm.qti.uceservice@2.1.so -vendor/lib/com.qualcomm.qti.uceservice@2.2.so -vendor/lib/com.qualcomm.qti.uceservice@2.3.so vendor/lib64/com.qualcomm.qti.imscmservice@1.0.so vendor/lib64/com.qualcomm.qti.imscmservice@2.0.so vendor/lib64/com.qualcomm.qti.imscmservice@2.1.so @@ -1629,8 +1561,6 @@ vendor/bin/hw/vendor.qti.hardware.soter@1.0-service vendor/bin/SoterProvisioningTool vendor/bin/vendor.qti.hardware.soter@1.0-provision vendor/etc/init/vendor.qti.hardware.soter@1.0-service.rc -vendor/lib/hw/vendor.qti.hardware.soter@1.0-impl.so -vendor/lib/vendor.qti.hardware.soter@1.0.so vendor/lib64/hw/vendor.qti.hardware.soter@1.0-impl.so vendor/lib64/vendor.qti.hardware.soter@1.0.so @@ -1713,7 +1643,6 @@ vendor/etc/thermald-devices.conf vendor/app/TimeService/TimeService.apk vendor/bin/time_daemon vendor/etc/init/init.time_daemon.rc -vendor/lib/libtime_genoff.so vendor/lib64/libtime_genoff.so # Touch firmware @@ -1727,12 +1656,6 @@ vendor/firmware/novatek_ts_mp.bin # Trusted Execution Environment connector vendor/bin/hw/vendor.qti.hardware.qteeconnector@1.0-service vendor/etc/init/vendor.qti.hardware.qteeconnector@1.0-service.rc -vendor/lib/hw/vendor.qti.hardware.qteeconnector@1.0-impl.so -vendor/lib/libGPQTEEC_vendor.so -vendor/lib/libGPTEE_vendor.so -vendor/lib/libQTEEConnector_listener.so -vendor/lib/libQTEEConnector_vendor.so -vendor/lib/vendor.qti.hardware.qteeconnector@1.0.so vendor/lib64/hw/vendor.qti.hardware.qteeconnector@1.0-impl.so vendor/lib64/libGPQTEEC_vendor.so vendor/lib64/libGPTEE_vendor.so @@ -1750,7 +1673,6 @@ vendor/app/TrustZoneAccessService/TrustZoneAccessService.apk vendor/firmware/aw87xxx_acf.bin # VM mem -vendor/lib/libvmmem.so vendor/lib64/libvmmem.so # VM mgr @@ -1787,7 +1709,6 @@ vendor/firmware/vpu20_4v_unsigned.mbn vendor/bin/hw/android.hardware.drm@1.4-service.widevine vendor/etc/init/android.hardware.drm@1.4-service.widevine.rc vendor/etc/vintf/manifest/manifest_android.hardware.drm@1.4-service.widevine.xml -vendor/lib/mediadrm/libwvdrmengine.so vendor/lib64/mediadrm/libwvdrmengine.so vendor/lib64/liboemcrypto.so vendor/lib64/libtrustedapploader.so @@ -1835,7 +1756,6 @@ vendor/etc/seccomp_policy/wfdhdcphalservice.policy vendor/etc/seccomp_policy/wfdvndservice.policy vendor/etc/seccomp_policy/wifidisplayhalservice.policy vendor/etc/wfdconfig.xml -vendor/lib/libmm-hdcpmgr.so vendor/lib64/hw/vendor.qti.hardware.wifidisplaysession@1.0-impl.so vendor/lib64/libFileMux_proprietary.so vendor/lib64/libmm-hdcpmgr.so