sdm845-common: Update blobs from OxygenOS 10.3.0

* Also pin P aptX blobs (they'll be updated in next patch)

Change-Id: I7d90dad4df10770d20818e683f2def428737af02

BoardConfigCommon.mk

@@ -14,6 +14,8 @@
 # limitations under the License.
 #
 
+BUILD_BROKEN_DUP_RULES := true
+
 BOARD_VENDOR := oneplus
 
 COMMON_PATH := device/oneplus/sdm845-common

common.mk

@@ -90,6 +90,7 @@ PRODUCT_PACKAGES += \
 # Display
 PRODUCT_PACKAGES += \
     libdisplayconfig \
+    libqdMetaData \
     libqdMetaData.system \
     libvulkan \
     vendor.display.config@1.0
@@ -127,6 +128,7 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     android.hardware.nfc@1.0:64 \
     android.hardware.nfc@1.1:64 \
+    android.hardware.nfc@1.2:64 \
     android.hardware.secure_element@1.0:64 \
     com.android.nfc_extras \
     Tag \

extract-files.sh

@@ -76,6 +76,6 @@ fi
 
 COMMON_BLOB_ROOT="${LINEAGE_ROOT}/vendor/${VENDOR}/${DEVICE_COMMON}/proprietary"
 
-sed -i "s/android.hidl.base@1.0.so/libhidlbase.so\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00/" "${COMMON_BLOB_ROOT}/lib64/libwfdnative.so" "${COMMON_BLOB_ROOT}/lib/libwfdnative.so"
+sed -i "s/android.hidl.base@1.0.so/libhidlbase.so\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00/" "${COMMON_BLOB_ROOT}/lib64/libwfdnative.so"
 
 "${MY_DIR}/setup-makefiles.sh"

proprietary-files.txt

@@ -1,112 +1,88 @@
 # ANT+
-lib64/com.qualcomm.qti.ant@1.0.so
--lib64/libantradio.so
-lib/com.qualcomm.qti.ant@1.0.so
 -lib/libantradio.so
+-lib64/libantradio.so
+product/lib/com.qualcomm.qti.ant@1.0.so
+product/lib64/com.qualcomm.qti.ant@1.0.so
 
 # Bluetooth (aptX)
-lib64/libaptX_encoder.so
+lib64/libaptX_encoder.so|0cebad28afcf29f931bdc2d24fce2730dc882ecf
-lib64/libaptXHD_encoder.so
+lib64/libaptXHD_encoder.so|90f47f10af28b3ead143200cb4370b847c513127
-
-# CNE
-etc/permissions/cneapiclient.xml
-etc/permissions/com.quicinc.cne.xml
-framework/cneapiclient.jar
-framework/com.quicinc.cne.api-V1.0-java.jar
-framework/com.quicinc.cne.api-V1.1-java.jar
-framework/com.quicinc.cne.constants-V1.0-java.jar
-framework/com.quicinc.cne.constants-V2.0-java.jar
-framework/com.quicinc.cne.constants-V2.1-java.jar
-framework/com.quicinc.cne.jar
-framework/com.quicinc.cne.server-V1.0-java.jar
-framework/com.quicinc.cne.server-V2.0-java.jar
-framework/com.quicinc.cne.server-V2.1-java.jar
-framework/com.quicinc.cne.server-V2.2-java.jar
-framework/vendor.qti.hardware.data.latency-V1.0-java.jar
-framework/vendor.qti.hardware.data.qmi-V1.0-java.jar
-lib/com.quicinc.cne.server@1.0.so
-lib/vendor.qti.hardware.data.latency@1.0.so
-lib64/com.quicinc.cne.server@1.0.so
-lib64/vendor.qti.hardware.data.latency@1.0.so
--priv-app/CNEService/CNEService.apk
 
 # DASH
 -sbin/dashd;rootfs
 
 # DPM
-bin/dpmd
-etc/dpm/dpm.conf
-etc/init/dpmd.rc
-etc/permissions/com.qti.dpmframework.xml
-etc/permissions/dpmapi.xml
-framework/com.qti.dpmframework.jar
-framework/dpmapi.jar
 framework/tcmclient.jar
-lib/com.qualcomm.qti.dpm.api@1.0.so
+product/bin/dpmd
-lib/libdpmctmgr.so
+product/etc/dpm/dpm.conf
-lib/libdpmfdmgr.so
+product/etc/init/dpmd.rc
-lib/libdpmframework.so
+product/etc/permissions/com.qti.dpmframework.xml
-lib/libdpmtcm.so
+product/etc/permissions/dpmapi.xml
-lib64/com.qualcomm.qti.dpm.api@1.0.so
+product/framework/com.qti.dpmframework.jar
-lib64/libdpmctmgr.so
+product/framework/dpmapi.jar
-lib64/libdpmfdmgr.so
+product/lib/com.qualcomm.qti.dpm.api@1.0.so
-lib64/libdpmframework.so
+product/lib/libdpmctmgr.so
-lib64/libdpmtcm.so
+product/lib/libdpmfdmgr.so
--priv-app/dpmserviceapp/dpmserviceapp.apk
+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
 
 # HotwordEnrollment
 -priv-app/HotwordEnrollmentOKGoogleWCD9340/HotwordEnrollmentOKGoogleWCD9340.apk
 -priv-app/HotwordEnrollmentXGoogleWCD9340/HotwordEnrollmentXGoogleWCD9340.apk
 
 # IMS
--priv-app/ims/ims.apk|e33b65ab994691938696da56c4f41acd4bf832dc
 lib64/libdiag_system.so
-lib64/libimscamera_jni.so
+-product/priv-app/ims/ims.apk|4161acfa23df5ed8c095754e325f48d0f6968c6e
-lib64/libimsmedia_jni.so
+product/lib64/libimscamera_jni.so
-lib64/lib-imsvideocodec.so
+product/lib64/libimsmedia_jni.so
-lib64/lib-imsvtextutils.so
+product/lib64/lib-imsvideocodec.so
-lib64/lib-imsvt.so
+product/lib64/lib-imsvtextutils.so
-lib64/lib-imsvtutils.so
+product/lib64/lib-imsvt.so
-lib64/librcc.so
+product/lib64/lib-imsvtutils.so
-lib64/vendor.qti.imsrtpservice@1.0.so
+product/lib64/vendor.qti.imsrtpservice@2.0.so
 
 # Media
-lib64/libmmosal.so
-lib/extractors/libmmparser.so
 lib/libFileMux.so
 lib/libmmosal.so
 lib/libmmparser_lite.so
 lib/libOmxMux.so
+lib64/libmmosal.so
+-vendor/lib/libplatformconfig.so
+-vendor/lib64/libplatformconfig.so
 
 # NFC
--app/NxpNfcNci/NxpNfcNci.apk|b68d15c16e4cb5f5ab4e8118afbaa8fdcf17049a
+-app/NxpNfcNci/NxpNfcNci.apk|683f26e17a1e3547a821925e8a212720cb4992f6
 -app/NxpSecureElement/NxpSecureElement.apk
-etc/nfcee_access.xml|61a2dbaec0339b6c3c79b487a704d5dc6306b284
+etc/nfcee_access.xml|6621fa1927720008fc0bdf47d259b18c871c2c79
 etc/permissions/com.nxp.nfc.xml
 framework/com.nxp.nfc.jar
-lib64/ese_spi_nxp.so
 lib64/libnxpnfc_nci_jni.so
 lib64/libnxpnfc-nci.so
 
 # Telephony
--app/QtiTelephonyService/QtiTelephonyService.apk
-etc/permissions/qcrilhook.xml
-etc/permissions/qti_libpermissions.xml|ef3c88495f2f61a2d16e1445113a9d80f8db0e0a
-etc/permissions/qti_permissions.xml
-etc/permissions/telephonyservice.xml
 etc/permissions/privapp-permissions-qti.xml
+etc/permissions/qti_libpermissions.xml
+etc/permissions/qti_permissions.xml
 etc/sysconfig/qti_whitelist.xml
-framework/qcrilhook.jar
+-framework/qcnvitems.jar
-framework/qcnvitems.jar
+-product/app/QtiTelephonyService/QtiTelephonyService.apk
-framework/qti-telephony-common.jar|b1953a3599255f08f1785c677d22810f65e0167b
+product/etc/permissions/qcrilhook.xml
-framework/QtiTelephonyServicelibrary.jar
+product/etc/permissions/telephony_product_privapp-permissions-qti.xml
--priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk
+product/etc/permissions/telephonyservice.xml
+product/framework/qcrilhook.jar
+product/framework/QtiTelephonyServicelibrary.jar
+-product/priv-app/qcrilmsgtunnel/qcrilmsgtunnel.apk
 
 # WiFi Display
 bin/wfdservice
 etc/init/wfdservice.rc
-etc/wfdconfig.xml
 etc/wfdconfigsink.xml
+framework/arm64/boot-WfdCommon.oat
 -framework/WfdCommon.jar
 lib/com.qualcomm.qti.wifidisplayhal@1.0.so
 lib/libmmrtpdecoder.so
@@ -114,21 +90,37 @@ lib/libmmrtpencoder.so
 lib/libwfdaac.so
 lib/libwfdavenhancements.so
 lib/libwfdclient.so
-lib/libwfdcodecv4l2.so
 lib/libwfdcommonutils.so
 lib/libwfdconfigutils.so
 lib/libwfdmminterface.so
 lib/libwfdmmsink.so
-lib/libwfdmmsrc.so
+lib/libwfdmmsrc_system.so
-lib/libwfdnative.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