From bac83a33520a3db311dc9525448d18631fd8883e Mon Sep 17 00:00:00 2001 From: chandu078 Date: Fri, 26 Apr 2024 22:33:46 +0530 Subject: [PATCH] sm8550-common: Switch to 64 bit only builds Change-Id: I0e730663a0e1ad8b18cfa1163b94edf0acd64fff Signed-off-by: chandu078 --- BoardConfigCommon.mk | 7 ----- common.mk | 2 -- manifest.xml | 13 -------- proprietary-files.txt | 69 +------------------------------------------ 4 files changed, 1 insertion(+), 90 deletions(-) diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index d61ac27d..c21b6df8 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -48,13 +48,6 @@ TARGET_CPU_ABI := arm64-v8a TARGET_CPU_VARIANT := generic TARGET_CPU_VARIANT_RUNTIME := kryo300 -TARGET_2ND_ARCH := arm -TARGET_2ND_ARCH_VARIANT := armv8-2a -TARGET_2ND_CPU_ABI := armeabi-v7a -TARGET_2ND_CPU_ABI2 := armeabi -TARGET_2ND_CPU_VARIANT := generic -TARGET_2ND_CPU_VARIANT_RUNTIME := cortex-a75 - # Boot BOARD_BOOT_HEADER_VERSION := 4 BOARD_MKBOOTIMG_ARGS += --header_version $(BOARD_BOOT_HEADER_VERSION) diff --git a/common.mk b/common.mk index 6fc42bb1..f970fd3d 100644 --- a/common.mk +++ b/common.mk @@ -306,9 +306,7 @@ PRODUCT_PACKAGES += \ # Media PRODUCT_COPY_FILES += \ $(AUDIO_HAL_DIR)/configs/common/codec2/media_codecs_c2_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_c2_audio.xml \ - $(AUDIO_HAL_DIR)/configs/common/codec2/service/1.0/c2audio.vendor.base-arm.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/c2audio.vendor.base-arm.policy \ $(AUDIO_HAL_DIR)/configs/common/codec2/service/1.0/c2audio.vendor.base-arm64.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/c2audio.vendor.base-arm64.policy \ - $(AUDIO_HAL_DIR)/configs/common/codec2/service/1.0/c2audio.vendor.ext-arm.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/c2audio.vendor.ext-arm.policy \ $(AUDIO_HAL_DIR)/configs/common/codec2/service/1.0/c2audio.vendor.ext-arm64.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/c2audio.vendor.ext-arm64.policy \ $(LOCAL_PATH)/media/media_codecs_performance_kalama_vendor.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance_kalama.xml \ $(LOCAL_PATH)/media/media_codecs_performance_kalama_vendor.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance_kalama_vendor.xml \ diff --git a/manifest.xml b/manifest.xml index 14bbf4a0..55d191ad 100644 --- a/manifest.xml +++ b/manifest.xml @@ -48,19 +48,6 @@ default - - android.hardware.media.omx - hwbinder - 1.0 - - IOmx - default - - - IOmxStore - default - - android.hardware.nfc hwbinder diff --git a/proprietary-files.txt b/proprietary-files.txt index 1d812998..53eb9a2a 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -128,7 +128,6 @@ vendor/lib/rfsa/adsp/libvpt_action_recognition.so vendor/lib/rfsa/adsp/libworker_pool.so # ANT+ -system_ext/lib/com.qualcomm.qti.ant@1.0.so system_ext/lib64/com.qualcomm.qti.ant@1.0.so # Audio @@ -192,7 +191,6 @@ vendor/lib64/libsoc_helper.so vendor/lib64/vendor.qti.hardware.bttpi-V2-ndk.so # Bluetooth (A2DP) -system_ext/lib/vendor.qti.hardware.fm@1.0.so system_ext/lib64/vendor.qti.hardware.fm@1.0.so vendor/lib64/btaudio_offload_if.so vendor/lib64/hw/android.hardware.bluetooth.audio-impl-qti.so @@ -211,11 +209,6 @@ vendor/lib64/vendor.qti.hardware.fm@1.0.so;MODULE_SUFFIX=_vendor # 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/lib/libsysmon_cdsp_skel.so vendor/lib64/libcdsp_default_listener.so vendor/lib64/libcdsprpc.so vendor/lib64/libmdsprpc.so @@ -340,7 +333,6 @@ vendor/etc/charger_fw_fstab.qti # Configstore vendor/bin/hw/vendor.qti.hardware.capabilityconfigstore@1.0-service vendor/etc/init/vendor.qti.hardware.capabilityconfigstore@1.0-service.rc -vendor/lib/hw/vendor.qti.hardware.capabilityconfigstore@1.0-impl.so vendor/lib64/hw/vendor.qti.hardware.capabilityconfigstore@1.0-impl.so # Connection Security @@ -432,11 +424,9 @@ vendor/lib64/vendor.qti.hardware.dpmservice@1.1.so vendor/bin/dspservice vendor/etc/init/vendor.qti.hardware.dsp@1.0-service.rc vendor/etc/seccomp_policy/vendor.qti.hardware.dsp.policy -vendor/lib/vendor.qti.hardware.dsp@1.0.so vendor/lib64/vendor.qti.hardware.dsp@1.0.so # Diag -system_ext/lib/vendor.qti.diaghal@1.0.so system_ext/lib64/vendor.qti.diaghal@1.0.so vendor/bin/diag-router vendor/etc/init/vendor.qti.diag.rc @@ -451,7 +441,6 @@ vendor/lib64/libhdr_tm.so vendor/bin/qdcmss vendor/etc/init/qdcmss.rc vendor/etc/snapdragon_color_libs_config.xml --vendor/lib/libvmmem.so vendor/lib64/libbacklight-calib.so vendor/lib64/libdigital-dimming.so vendor/lib64/libdpps.so @@ -462,7 +451,7 @@ vendor/lib64/libqdcm-json-mode-parser.so vendor/lib64/libqdcm-mode-parser.so vendor/lib64/libsnapdragoncolor-manager.so vendor/lib64/libsnapdragoncolor-qdcm.so --vendor/lib64/libvmmem.so +vendor/lib64/libvmmem.so vendor/lib64/vendor.qti.hardware.qdutils_disp@1.0.so # Display (SDM) @@ -588,8 +577,6 @@ vendor/etc/vintf/manifest/vendor.semc.hardware.extlight-somc.xml vendor/lib64/libfastcvdsp_stub.so # FM -system_ext/lib/fm_helium.so -system_ext/lib/libfm-hci.so system_ext/lib64/fm_helium.so system_ext/lib64/libfm-hci.so vendor/lib64/hw/vendor.qti.hardware.fm@1.0-impl.so @@ -682,24 +669,6 @@ vendor/etc/init/android.hardware.gatekeeper@1.0-service-qti.rc vendor/lib64/hw/android.hardware.gatekeeper@1.0-impl-qti.so # Graphics (Adreno) -vendor/lib/egl/eglSubDriverAndroid.so -vendor/lib/egl/libEGL_adreno.so;SYMLINK=vendor/lib/libEGL_adreno.so -vendor/lib/egl/libGLESv1_CM_adreno.so -vendor/lib/egl/libGLESv2_adreno.so;SYMLINK=vendor/lib/libGLESv2_adreno.so -vendor/lib/egl/libVkLayer_ADRENO_qprofiler.so -vendor/lib/egl/libq3dtools_adreno.so;SYMLINK=vendor/lib/libq3dtools_adreno.so -vendor/lib/egl/libq3dtools_esx.so -vendor/lib/libCB.so -vendor/lib/libOpenCL.so -vendor/lib/libadreno_app_profiles.so -vendor/lib/libadreno_utils.so -vendor/lib/libgpudataproducer.so -vendor/lib/libgsl.so -vendor/lib/libkcl.so -vendor/lib/libkernelmanager.so -vendor/lib/libllvm-glnext.so -vendor/lib/libllvm-qcom.so -vendor/lib/libllvm-qgl.so vendor/lib64/egl/eglSubDriverAndroid.so vendor/lib64/egl/libEGL_adreno.so;SYMLINK=vendor/lib64/libEGL_adreno.so vendor/lib64/egl/libGLESv1_CM_adreno.so @@ -734,7 +703,6 @@ vendor/gpu/kbc/unified_kbcs_64.bin vendor/gpu/kbc/unified_ksqs.bin # Graphics (Vulkan) -vendor/lib/hw/vulkan.adreno.so vendor/lib64/hw/vulkan.adreno.so # Hotword Enrollment @@ -752,8 +720,6 @@ vendor/etc/init/init.sony.idd.rc vendor/etc/init/vendor.semc.system.idd@1.1-service.rc vendor/etc/security/idd_config.pem vendor/etc/security/idd_report.pem -vendor/lib/libidd.so -vendor/lib/vendor.semc.system.idd@1.0.so vendor/lib64/libidd.so vendor/lib64/libprotobuf-c-idd.so vendor/lib64/vendor.semc.system.idd@1.0.so @@ -882,8 +848,6 @@ vendor/lib64/vendor.qti.hardware.limits@1.2.so # Media odm/etc/media_profiles_V1_0.xml -system_ext/lib/libmmosal.so -system_ext/lib/libmmparser_lite.so system_ext/lib64/libmmosal.so system_ext/lib64/libmmparser_lite.so vendor/bin/hw/qconfigservice @@ -1151,34 +1115,10 @@ vendor/lib64/libsmemlog.so vendor/lib64/libsubsystem_control.so vendor/lib64/libsystem_health_mon.so -# QRTR - -# QSAP -vendor/bin/qsap_dcfd -vendor/bin/qsap_location -vendor/bin/qsap_qapeservice -vendor/bin/qsap_sensors -vendor/bin/qsap_voiceui -vendor/etc/init/dcfd.rc -vendor/etc/init/vendor.qsap.location.rc -vendor/etc/init/vendor.qsap.qapeservice.rc -vendor/etc/init/vendor.qsap.sensors.rc -vendor/etc/seccomp_policy/qsap_dcfd.policy -vendor/etc/seccomp_policy/qsap_qapeservice.policy -vendor/etc/seccomp_policy/qsap_sensors.policy -vendor/etc/seccomp_policy/qsap_voiceui.policy -vendor/lib64/libDcfHalBleProto.so -vendor/lib64/libDcfHalFramework.so -vendor/lib64/libDcfHalLogger.so -vendor/lib64/libDcfHalQtiMutex.so -vendor/lib64/libSensorsInterface.so -vendor/lib64/libqape_oem_ext.so - # QSPM vendor/bin/vendor.qti.qspmhal@1.0-service vendor/etc/init/vendor.qti.qspmhal@1.0-service.rc vendor/etc/seccomp_policy/qspm.policy -vendor/lib/vendor.qti.qspmhal@1.0.so vendor/lib64/vendor.qti.qspmhal@1.0-impl.so vendor/lib64/vendor.qti.qspmhal@1.0.so @@ -1241,7 +1181,6 @@ vendor/etc/vintf/manifest/qms-saidl.xml vendor/etc/vintf/manifest/qtiradio-saidl.xml vendor/etc/vintf/manifest/vendor.qti.hardware.radio.am.xml vendor/etc/vintf/manifest/vendor.qti.hardware.radio.qtiradioconfig.xml -vendor/lib/libqrtr.so vendor/lib64/deviceInfoServiceModuleNr.so vendor/lib64/lib-qhcpservice.so vendor/lib64/libQtiRilLoadable.so @@ -1385,9 +1324,6 @@ vendor/bin/hw/vendor.somc.hardware.miscta@1.0-service vendor/etc/init/init.taqmi.rc vendor/etc/init/vendor.semc.hardware.secd@1.1-service.rc vendor/etc/init/vendor.somc.hardware.miscta@1.0-service.rc -vendor/lib/libdevice_security_vendor.so -vendor/lib/libmiscta.so -vendor/lib/vendor.somc.hardware.security.secd@1.1.so vendor/lib64/libdevice_security_vendor.so vendor/lib64/libifaa.so vendor/lib64/libmiscta.so @@ -1511,7 +1447,6 @@ vendor/lib64/vendor.qti.hardware.sensorscalibrate@1.0.so # Soter vendor/bin/hw/vendor.qti.hardware.soter@1.0-service vendor/etc/init/vendor.qti.hardware.soter@1.0-service.rc -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 @@ -1522,7 +1457,6 @@ vendor/lib64/vendor.somc.hardware.aidlmiscta-V1-ndk_platform.so # TA QMI vendor/bin/ta_qmi_service -vendor/lib/libta.so vendor/lib64/libta.so # TA daemon @@ -1546,7 +1480,6 @@ vendor/lib64/vendor.semc.hardware.thermal@1.0.so 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 # Trimarea