From 5d377ba4d682d27bfc961aac4e916a1b0bda0e49 Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Thu, 19 Nov 2020 23:03:55 +0100 Subject: [PATCH] sm8250-common: Update blobs from OOS11 --- BoardConfigCommon.mk | 2 + common.mk | 3 - configs/libnfc-nci.conf | 126 --------------------- extract-files.sh | 2 +- proprietary-files.txt | 194 ++++++++++++++++----------------- rootdir/etc/init.qcom.rc | 5 - sepolicy/private/dashd.te | 2 - sepolicy/private/file_contexts | 3 - 8 files changed, 97 insertions(+), 240 deletions(-) delete mode 100644 configs/libnfc-nci.conf delete mode 100644 sepolicy/private/dashd.te diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 1e50887..6604343 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -14,6 +14,8 @@ # limitations under the License. # +BUILD_BROKEN_DUP_RULES := true + BOARD_VENDOR := oneplus COMMON_PATH := device/oneplus/sm8250-common diff --git a/common.mk b/common.mk index 6e9a8ba..d46fe25 100644 --- a/common.mk +++ b/common.mk @@ -164,9 +164,6 @@ PRODUCT_PACKAGES += \ vendor.nxp.nxpese@1.0:64 \ vendor.nxp.nxpnfc@1.0:64 -PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/configs/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/vendor_overlay/$(PRODUCT_TARGET_VNDK_VERSION)/etc/libnfc-nci.conf - # Power PRODUCT_PACKAGES += \ android.hardware.power-service.oneplus_kona diff --git a/configs/libnfc-nci.conf b/configs/libnfc-nci.conf deleted file mode 100644 index 6668684..0000000 --- a/configs/libnfc-nci.conf +++ /dev/null @@ -1,126 +0,0 @@ -########################## Start of libnfc-nci.conf ########################### -############################################################################### -# Application options -NFC_DEBUG_ENABLED=1 -############################################################################### -# performance measurement -# Change this setting to control how often USERIAL log the performance (throughput) -# data on read/write/poll -# defailt is to log performance dara for every 100 read or write -#REPORT_PERFORMANCE_MEASURE=100 -############################################################################### -# File used for NFA storage -NFA_STORAGE="/data/nfc" -############################################################################### -# Configure the default NfcA/IsoDep techology and protocol route. Can be -# either a secure element (e.g. 0xF4) or the host (0x00) -#DEFAULT_ISODEP_ROUTE=0x00 - -############################################################################### -## Default poll duration (in ms) -## The defualt is 500ms if not set -NFA_DM_DISC_DURATION_POLL=500 - -############################################################################### -# Force UICC to only listen to the following technology(s). -# The bits are defined as tNFA_TECHNOLOGY_MASK in nfa_api.h. -# Default is NFA_TECHNOLOGY_MASK_A | NFA_TECHNOLOGY_MASK_B | NFA_TECHNOLOGY_MASK_F -UICC_LISTEN_TECH_MASK=0x07 - -############################################################################### -# Force HOST listen feature enable or disable. -# 0: Disable -# 1: Enable -HOST_LISTEN_ENABLE=0x01 -############################################################################### -# When screen is turned off, specify the desired power state of the controller. -# 0: power-off-sleep state; DEFAULT -# 1: full-power state -# 2: screen-off card-emulation (CE4/CE3/CE1 modes are used) -SCREEN_OFF_POWER_STATE=1 -############################################################################### -# Force tag polling for the following technology(s). -# The bits are defined as tNFA_TECHNOLOGY_MASK in nfa_api.h. -# Default is NFA_TECHNOLOGY_MASK_A | NFA_TECHNOLOGY_MASK_B | -# NFA_TECHNOLOGY_MASK_F | NFA_TECHNOLOGY_MASK_ISO15693 | -# NFA_TECHNOLOGY_MASK_B_PRIME | -# NFA_TECHNOLOGY_MASK_A_ACTIVE | NFA_TECHNOLOGY_MASK_F_ACTIVE. -# -# Notable bits: -# NFA_TECHNOLOGY_MASK_A 0x01 /* NFC Technology A */ -# NFA_TECHNOLOGY_MASK_B 0x02 /* NFC Technology B */ -# NFA_TECHNOLOGY_MASK_F 0x04 /* NFC Technology F */ -# NFA_TECHNOLOGY_MASK_ISO15693 0x08 /* Proprietary Technology */ -# NFA_TECHNOLOGY_MASK_A_ACTIVE 0x40 /* NFC Technology A active mode */ -# NFA_TECHNOLOGY_MASK_F_ACTIVE 0x80 /* NFC Technology F active mode */ -POLLING_TECH_MASK=0xCF -############################################################################### -# Force P2P to only listen for the following technology(s). -# The bits are defined as tNFA_TECHNOLOGY_MASK in nfa_api.h. -# Default is NFA_TECHNOLOGY_MASK_A | NFA_TECHNOLOGY_MASK_F | -# NFA_TECHNOLOGY_MASK_A_ACTIVE | NFA_TECHNOLOGY_MASK_F_ACTIVE -# -# Notable bits: -# NFA_TECHNOLOGY_MASK_A 0x01 /* NFC Technology A */ -# NFA_TECHNOLOGY_MASK_F 0x04 /* NFC Technology F */ -# NFA_TECHNOLOGY_MASK_A_ACTIVE 0x40 /* NFC Technology A active mode */ -# NFA_TECHNOLOGY_MASK_F_ACTIVE 0x80 /* NFC Technology F active mode */ -P2P_LISTEN_TECH_MASK=0xC4 -############################################################################### -PRESERVE_STORAGE=0x01 -############################################################################### -# Override the stack default for NFA_EE_MAX_EE_SUPPORTED set in nfc_target.h. -# The value is set to 3 by default as it assumes we will discover 0xF2, -# 0xF3, and 0xF4. If a platform will exclude and SE, this value can be reduced -# so that the stack will not wait any longer than necessary. - -# Maximum EE supported number -# NXP PN547C2 0x02 -# NXP PN65T 0x03 -# NXP PN548C2 0x02 -# NXP PN66T 0x03 -NFA_MAX_EE_SUPPORTED=0x03 -############################################################################## -# Deactivate notification wait time out in seconds used in ETSI Reader mode -# 0 - Infinite wait -NFA_DM_DISC_NTF_TIMEOUT=0 - -############################################################################### -# AID_MATCHING constants -# AID_MATCHING_EXACT_ONLY 0x00 -# AID_MATCHING_EXACT_OR_PREFIX 0x01 -# AID_MATCHING_PREFIX_ONLY 0x02 -#AID_MATCHING_EXACT_OR_SUBSET_OR_PREFIX 0x03 -AID_MATCHING_MODE=0x03 -############################################################################### -# Preferred Secure Element for Technology based routing -# eSE 0x01 -# UICC 0x02 - -NXP_PRFD_TECH_SE=0x01 - -################################################################################ -#Set bit to 1 , black list is enabled -#Set bit to 0, to disable balcklist -NFA_AID_BLOCK_ROUTE=0x00 - -################################################################################ -# Maximum WTX requests entertained by MW -NXP_WM_MAX_WTX_COUNT=240 -################################################################################ -#Set the default Felica T3T System Code : -#This settings will be used when application does not set this parameter -DEFAULT_SYS_CODE={FE:FE} -######################################################################### -#Set NCI credit notification timeout value -NXP_NCI_CREDIT_NTF_TIMEOUT=2 -######################################################################### - -############################################################################### -# Firmware patch format, Only 1 and 5 should be set -# 0 -> NFC Default -# 1 -> EMVCO Default -# 3 -> EMVCO Polling, DISC_IDLE = POWER_OFF, DISC DEACTIVATE = Removal process -# 5 -> EMVCO Cert Polling, DISC_IDLE = Removal process , DISC DEACTIVATE = POWER_OFF -# 7 -> EMVCO Polling, DISC_IDLE = POWER_OFF, DISC DEACTIVATE = POWER_OFF -NFA_CONFIG_FORMAT=1 diff --git a/extract-files.sh b/extract-files.sh index 6914443..8200b4e 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -32,7 +32,7 @@ source "${HELPER}" function blob_fixup() { case "${1}" in - lib64/libwfdnative.so) + system_ext/lib64/libwfdnative.so) sed -i "s/android.hidl.base@1.0.so/libhidlbase.so\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00/" "${2}" ;; esac diff --git a/proprietary-files.txt b/proprietary-files.txt index 89061a2..451c5bb 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -1,130 +1,124 @@ -# All unpinned blobs below are extracted from OnePlus8ProOxygen_15.E.21_OTA_021_all_2008080100_c953 +# All unpinned blobs below are extracted from OnePlus8ProOxygen_15.O.30_OTA_0300_all_2010031617_f9ca0bfd1b # ANT+ --lib/libantradio.so --lib64/libantradio.so -product/lib/com.qualcomm.qti.ant@1.0.so -product/lib64/com.qualcomm.qti.ant@1.0.so +system_ext/lib/com.qualcomm.qti.ant@1.0.so +system_ext/lib64/com.qualcomm.qti.ant@1.0.so # Bluetooth (aptX) - from crosshatch - QP1A.190711.020 product/lib64/libaptX_encoder.so|df1c89d7af1bb35808d5fe3496b04ba066c10cbc product/lib64/libaptXHD_encoder.so|e13fa70c97caaa24d061678bdee608eb8850a69e -# DASH -sbin/dashd:bin/dashd - # Display -product/lib64/libsdm-disp-apis.qti.so -product/lib64/vendor.display.color@1.0.so +system_ext/lib64/libsdm-disp-apis.qti.so +system_ext/lib64/vendor.display.color@1.0.so # DPM framework/tcmclient.jar -product/bin/dpmd -product/etc/dpm/dpm.conf -product/etc/init/dpmd.rc -product/etc/permissions/com.qti.dpmframework.xml -product/etc/permissions/dpmapi.xml -product/framework/com.qti.dpmframework.jar -product/framework/dpmapi.jar -product/lib/com.qualcomm.qti.dpm.api@1.0.so -product/lib/libdpmctmgr.so -product/lib/libdpmfdmgr.so -product/lib/libdpmframework.so -product/lib/libdpmtcm.so -product/lib64/com.qualcomm.qti.dpm.api@1.0.so -product/lib64/libdpmctmgr.so -product/lib64/libdpmfdmgr.so -product/lib64/libdpmframework.so -product/lib64/libdpmtcm.so +system_ext/bin/dpmd +system_ext/etc/dpm/dpm.conf +system_ext/etc/init/dpmd.rc +system_ext/etc/permissions/com.qti.dpmframework.xml +system_ext/etc/permissions/dpmapi.xml +system_ext/framework/com.qti.dpmframework.jar +system_ext/framework/dpmapi.jar +system_ext/lib/com.qualcomm.qti.dpm.api@1.0.so +system_ext/lib/libdpmctmgr.so +system_ext/lib/libdpmfdmgr.so +system_ext/lib/libdpmframework.so +system_ext/lib/libdpmtcm.so +system_ext/lib/vendor.qti.diaghal@1.0.so +system_ext/lib64/com.qualcomm.qti.dpm.api@1.0.so +system_ext/lib64/libdpmctmgr.so +system_ext/lib64/libdpmfdmgr.so +system_ext/lib64/libdpmframework.so +system_ext/lib64/libdpmtcm.so +system_ext/lib64/vendor.qti.diaghal@1.0.so # HotwordEnrollment --priv-app/HotwordEnrollmentOKGoogleHEXAGON/HotwordEnrollmentOKGoogleHEXAGON.apk --priv-app/HotwordEnrollmentXGoogleHEXAGON/HotwordEnrollmentXGoogleHEXAGON.apk +-product/priv-app/HotwordEnrollmentOKGoogleHEXAGON/HotwordEnrollmentOKGoogleHEXAGON.apk +-product/priv-app/HotwordEnrollmentXGoogleHEXAGON/HotwordEnrollmentXGoogleHEXAGON.apk # IMS --product/priv-app/ims/ims.apk|df0b116bec248f6d7402abe3c10379fe7b62759f -product/lib64/libdiag_system.so -product/lib64/libimscamera_jni.so -product/lib64/libimsmedia_jni.so -product/lib64/lib-imsvideocodec.so -product/lib64/lib-imsvtextutils.so -product/lib64/lib-imsvt.so -product/lib64/lib-imsvtutils.so -product/lib64/vendor.qti.imsrtpservice@2.0.so +-system_ext/priv-app/ims/ims.apk|af157d4abd37cd24a628dad77ecb1ca258f1345c +system_ext/lib64/lib-imsvideocodec.so +system_ext/lib64/lib-imsvt.so +system_ext/lib64/lib-imsvtextutils.so +system_ext/lib64/lib-imsvtutils.so +system_ext/lib64/libdiag_system.so +system_ext/lib64/libimscamera_jni.so +system_ext/lib64/libimsmedia_jni.so +system_ext/lib64/vendor.qti.imsrtpservice@3.0.so # Media -lib/libFileMux.so -lib/libmmosal.so -lib/libmmparser_lite.so -lib/libOmxMux.so -lib64/libmmosal.so +system_ext/lib/libmmosal.so +system_ext/lib/libmmparser_lite.so +system_ext/lib64/libmmosal.so # NFC --app/NxpNfcNci/NxpNfcNci.apk|1d3f75a7e86d3bf2509606bcd92329d1370f7c61 -etc/nfcee_access.xml -etc/permissions/com.nxp.nfc.xml -framework/com.nxp.nfc.jar -lib64/libnxpnfc_nci_jni.so -lib64/libnxpnfc-nci.so +system/etc/nfcee_access.xml +-system_ext/app/NQNfcNci/NQNfcNci.apk|c9e0c8e3251adf399036b61cf2b686c06dabc03f +system_ext/etc/permissions/com.nxp.nfc.nq.xml +system_ext/framework/com.nxp.nfc.nq.jar +system_ext/lib64/libnqnfc-nci.so +system_ext/lib64/libnqnfc_nci_jni.so # Telephony etc/permissions/privapp-permissions-qti.xml -etc/permissions/qti_libpermissions.xml -etc/permissions/qti_permissions.xml etc/sysconfig/qti_whitelist.xml -framework/qcnvitems.jar --product/app/QtiTelephonyService/QtiTelephonyService.apk -product/etc/permissions/qcrilhook.xml -product/etc/permissions/telephonyservice.xml -product/framework/qcrilhook.jar -product/framework/QtiTelephonyServicelibrary.jar --product/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk +-system_ext/app/QtiTelephonyService/QtiTelephonyService.apk +system_ext/etc/permissions/qcrilhook.xml +system_ext/etc/permissions/qti_libpermissions.xml +system_ext/etc/permissions/qti_permissions.xml +system_ext/etc/permissions/telephonyservice.xml +system_ext/framework/qcrilhook.jar +-system_ext/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk # Telephony (qti-telephony-common) - from DRG - QKQ1.190828.002 product/framework/qti-telephony-common.jar|b4d187700f279cdbd40e74b4c3be4504f10d8b29 # WiFi Display -bin/wfdservice -etc/init/wfdservice.rc -etc/wfdconfigsink.xml -framework/WfdCommon.jar -lib/com.qualcomm.qti.wifidisplayhal@1.0.so -lib/libmmrtpdecoder.so -lib/libmmrtpencoder.so -lib/libwfdaac.so -lib/libwfdavenhancements.so -lib/libwfdclient.so -lib/libwfdcommonutils.so -lib/libwfdconfigutils.so -lib/libwfdmminterface.so -lib/libwfdmmsink.so -lib/libwfdmmsrc_system.so -lib/libwfdrtsp.so -lib/libwfdservice.so -lib/libwfdsinksm.so -lib/libwfdsm.so -lib/libwfduibcinterface.so -lib/libwfduibcsink.so -lib/libwfduibcsinkinterface.so -lib/libwfduibcsrc.so -lib/libwfduibcsrcinterface.so -lib64/libFileMux.so -lib64/libmmparser_lite.so -lib64/libmmrtpdecoder.so -lib64/libmmrtpencoder.so -lib64/libwfdclient.so -lib64/libwfdcommonutils.so -lib64/libwfdconfigutils.so -lib64/libwfdmminterface.so -lib64/libwfdmmsink.so -lib64/libwfdnative.so -lib64/libwfdrtsp.so -lib64/libwfdsinksm.so -lib64/libwfdsm.so -lib64/libwfduibcinterface.so -lib64/libwfduibcsink.so -lib64/libwfduibcsinkinterface.so -lib64/libwfduibcsrc.so -lib64/libwfduibcsrcinterface.so --priv-app/WfdService/WfdService.apk -product/lib/vendor.qti.hardware.wifidisplaysession@1.0.so +system_ext/bin/wfdservice +system_ext/etc/init/wfdservice.rc +system_ext/etc/seccomp_policy/wfdservice.policy +system_ext/etc/wfdconfigsink.xml +system_ext/lib/com.qualcomm.qti.wifidisplayhal@1.0.so +system_ext/lib/libmmrtpdecoder.so +system_ext/lib/libmmrtpencoder.so +system_ext/lib/libwfdaac.so +system_ext/lib/libwfdavenhancements.so +system_ext/lib/libwfdclient.so +system_ext/lib/libwfdcommonutils.so +system_ext/lib/libwfdconfigutils.so +system_ext/lib/libwfddisplayconfig.so +system_ext/lib/libwfdmminterface.so +system_ext/lib/libwfdmmsink.so +system_ext/lib/libwfdmmsrc_system.so +system_ext/lib/libwfdrtsp.so +system_ext/lib/libwfdservice.so +system_ext/lib/libwfdsinksm.so +system_ext/lib/libwfduibcinterface.so +system_ext/lib/libwfduibcsink.so +system_ext/lib/libwfduibcsinkinterface.so +system_ext/lib/libwfduibcsrc.so +system_ext/lib/libwfduibcsrcinterface.so +system_ext/lib/vendor.qti.hardware.wifidisplaysession@1.0.so +system_ext/lib64/libmmparser_lite.so +system_ext/lib64/libmmrtpdecoder.so +system_ext/lib64/libmmrtpencoder.so +system_ext/lib64/libwfdclient.so +system_ext/lib64/libwfdcommonutils.so +system_ext/lib64/libwfdconfigutils.so +system_ext/lib64/libwfddisplayconfig.so +system_ext/lib64/libwfdmminterface.so +system_ext/lib64/libwfdmmsink.so +system_ext/lib64/libwfdnative.so +system_ext/lib64/libwfdrtsp.so +system_ext/lib64/libwfdsinksm.so +system_ext/lib64/libwfduibcinterface.so +system_ext/lib64/libwfduibcsink.so +system_ext/lib64/libwfduibcsinkinterface.so +system_ext/lib64/libwfduibcsrc.so +system_ext/lib64/libwfduibcsrcinterface.so +-system_ext/priv-app/WfdService/WfdService.apk diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc index 1080f0c..3c9f47c 100644 --- a/rootdir/etc/init.qcom.rc +++ b/rootdir/etc/init.qcom.rc @@ -11,10 +11,5 @@ on boot on charger write /sys/class/backlight/panel0-backlight/brightness 150 -service dashd /system/bin/dashd - class core - critical - group root system - service vendor.secure_element_hal_service /system/bin/true disabled diff --git a/sepolicy/private/dashd.te b/sepolicy/private/dashd.te deleted file mode 100644 index 610a0c6..0000000 --- a/sepolicy/private/dashd.te +++ /dev/null @@ -1,2 +0,0 @@ -type dashd, coredomain, domain; -type dashd_exec, exec_type, system_file_type, file_type; diff --git a/sepolicy/private/file_contexts b/sepolicy/private/file_contexts index a98226b..f0ff596 100644 --- a/sepolicy/private/file_contexts +++ b/sepolicy/private/file_contexts @@ -15,9 +15,6 @@ /system/bin/hw/lineage\.powershare@1\.0-service\.oneplus_kona u:object_r:hal_powershare_kona_exec:s0 /system/bin/hw/lineage\.touch@1\.0-service\.oneplus_kona u:object_r:hal_touch_kona_exec:s0 -# DASH -/system/bin/dashd u:object_r:dashd_exec:s0 - # tri-state-key /system/bin/tri-state-key_daemon u:object_r:tri-state-key_daemon_exec:s0