Add vendor blobs support for B4S4

TEST:make aosp_bonito-userdebug/sargo and flashed B4/S4
BUG:117168130
Change-Id: I6b6f281cb8d9544903d5fd1127ccff1b2382122e

3 files changed, 98 insertions, 43 deletions

diff --git a/self-extractors_sargo/extract-lists.txt b/self-extractors_sargo/extract-lists.txt
index 0b8c5709..b29eb590 100644
--- a/self-extractors_sargo/extract-lists.txt
+++ b/self-extractors_sargo/extract-lists.txt
@@ -5,13 +5,15 @@
     ;;
   qcom)
     TO_EXTRACT="\
-            system/etc/firmware/dnd.descriptor \
-            system/etc/firmware/dnd.sound_model \
-            system/etc/firmware/music_detector.descriptor \
-            system/etc/firmware/music_detector.sound_model \
-            system/etc/init/init-persist.rc \
+            system/compatibility_matrix.xml \
+            system/etc/cne/andsfCne.xml \
+            system/etc/cne/Nexus/ATT/ATT_profiles.xml \
+            system/etc/cne/Nexus/ROW/ROW_profiles.xml \
+            system/etc/cne/Nexus/VZW/VZW_profiles.xml \
+            system/etc/ld.config.28.txt \
+            system/etc/llndk.libraries.28.txt \
             system/etc/permissions/cneapiclient.xml \
-            system/etc/permissions/com.qualcomm.qti.imscmservice.xml \
+            system/etc/permissions/com.google.android.factoryota.xml \
             system/etc/permissions/com.quicinc.cne.xml \
             system/etc/permissions/embms.xml \
             system/etc/permissions/lpa.xml \
@@ -23,9 +25,15 @@
             system/etc/permissions/telephonyservice.xml \
             system/etc/permissions/uimremoteclient.xml \
             system/etc/permissions/uimremoteserver.xml \
+            system/etc/permissions/UimService.xml \
+            system/framework/com.android.future.usb.accessory.jar \
+            system/framework/com.android.location.provider.jar \
+            system/framework/com.android.mediadrm.signer.jar \
             system/framework/com.qualcomm.qti.uceservice-V2.0-java.jar \
-            system/framework/embmslibrary.jar \
+            system/framework/javax.obex.jar \
             system/framework/LteDirectDiscoveryLibrary.jar \
+            system/framework/org.apache.http.legacy.boot.jar \
+            system/framework/org.apache.http.legacy.boot.jar.prof \
             system/framework/qcrilhook.jar \
             system/framework/QtiTelephonyServicelibrary.jar \
             system/framework/radioconfiginterfacelibrary.jar \
@@ -35,8 +43,15 @@
             system/framework/uimremoteserverlibrary.jar \
             system/framework/uimremotesimlocklibrary.jar \
             system/framework/vendor.qti.hardware.alarm-V1.0-java.jar \
-            system/framework/vendor.qti.hardware.data.latency-V1.0-java.jar \
+            system/framework/vendor.qti.hardware.fingerprint-V1.0-java.jar \
+            system/framework/vendor.qti.hardware.soter-V1.0-java.jar \
+            system/lib64/libadsprpc_system.so \
+            system/lib64/libcdsprpc_system.so \
             system/lib64/libDiagService.so \
+            system/lib64/libdiag_system.so \
+            system/lib64/libdisplayconfig.so \
+            system/lib64/libGPQTEEC_system.so \
+            system/lib64/libGPTEE_system.so \
             system/lib64/libimscamera_jni.so \
             system/lib64/libimsmedia_jni.so \
             system/lib64/lib-imsvideocodec.so \
@@ -45,16 +60,25 @@
             system/lib64/lib-imsvtutils.so \
             system/lib64/liblistenjni.so \
             system/lib64/liblistensoundmodel2.so \
-            system/lib64/libqcbor.so \
+            system/lib64/liblogcat.so \
+            system/lib64/libmdsprpc_system.so \
+            system/lib64/libminui.so \
+            system/lib64/libqsap_sdk.so \
+            system/lib64/libQTEEConnector_system.so \
             system/lib64/librcc.so \
             system/lib64/libsdm-disp-apis.so \
-            system/lib64/libseccam.so \
-            system/lib64/libsecureuisvc_jni.so \
-            system/lib64/libSeemplog.so \
+            system/lib64/libsdsprpc_system.so \
+            system/lib64/libsecureui_svcsock_system.so \
             system/lib64/libsensorslog.so \
-            system/lib64/libsmcinvokecred.so \
+            system/lib64/libsepol.so \
             system/lib64/libsns_low_lat_stream_stub.so \
-            system/lib64/libtzcom.so \
+            system/lib64/libunwind.so \
+            system/lib/libadsprpc_system.so \
+            system/lib/libcdsprpc_system.so \
+            system/lib/libdiag_system.so \
+            system/lib/libdisplayconfig.so \
+            system/lib/libGPQTEEC_system.so \
+            system/lib/libGPTEE_system.so \
             system/lib/libimscamera_jni.so \
             system/lib/libimsmedia_jni.so \
             system/lib/lib-imsvideocodec.so \
@@ -63,17 +87,21 @@
             system/lib/lib-imsvtutils.so \
             system/lib/liblistenjni.so \
             system/lib/liblistensoundmodel2.so \
-            system/lib/libqcbor.so \
+            system/lib/liblogwrap.so \
+            system/lib/libmdsprpc_system.so \
+            system/lib/libminui.so \
+            system/lib/libnl.so \
+            system/lib/libpac.so \
             system/lib/libqct_resampler.so \
+            system/lib/libqsap_sdk.so \
+            system/lib/libQTEEConnector_system.so \
             system/lib/librcc.so \
             system/lib/libsdm-disp-apis.so \
-            system/lib/libseccam.so \
-            system/lib/libsecureuisvc_jni.so \
-            system/lib/libSeemplog.so \
+            system/lib/libsdsprpc_system.so \
+            system/lib/libsecureui_svcsock_system.so \
             system/lib/libsensorslog.so \
-            system/lib/libsmcinvokecred.so \
             system/lib/libsns_low_lat_stream_stub.so \
-            system/lib/libtzcom.so \
+            system/lib/libunwind.so \
             system/lib/rfsa/adsp/libsns_low_lat_stream_skel.so \
             "
     ;;
diff --git a/self-extractors_sargo/qcom/staging/device-partial.mk b/self-extractors_sargo/qcom/staging/device-partial.mk
index 3fa83462..33137f9c 100644
--- a/self-extractors_sargo/qcom/staging/device-partial.mk
+++ b/self-extractors_sargo/qcom/staging/device-partial.mk
@@ -19,13 +19,15 @@ PRODUCT_PACKAGES := \
 
 #  blob(s) necessary for sargo hardware
 PRODUCT_COPY_FILES := \
-    vendor/qcom/sargo/proprietary/dnd.descriptor:system/etc/firmware/dnd.descriptor:qcom \
-    vendor/qcom/sargo/proprietary/dnd.sound_model:system/etc/firmware/dnd.sound_model:qcom \
-    vendor/qcom/sargo/proprietary/music_detector.descriptor:system/etc/firmware/music_detector.descriptor:qcom \
-    vendor/qcom/sargo/proprietary/music_detector.sound_model:system/etc/firmware/music_detector.sound_model:qcom \
-    vendor/qcom/sargo/proprietary/init-persist.rc:system/etc/init/init-persist.rc:qcom \
+    vendor/qcom/sargo/proprietary/compatibility_matrix.xml:system/compatibility_matrix.xml:qcom \
+    vendor/qcom/sargo/proprietary/andsfCne.xml:system/etc/cne/andsfCne.xml:qcom \
+    vendor/qcom/sargo/proprietary/ATT_profiles.xml:system/etc/cne/Nexus/ATT/ATT_profiles.xml:qcom \
+    vendor/qcom/sargo/proprietary/ROW_profiles.xml:system/etc/cne/Nexus/ROW/ROW_profiles.xml:qcom \
+    vendor/qcom/sargo/proprietary/VZW_profiles.xml:system/etc/cne/Nexus/VZW/VZW_profiles.xml:qcom \
+    vendor/qcom/sargo/proprietary/ld.config.28.txt:system/etc/ld.config.28.txt:qcom \
+    vendor/qcom/sargo/proprietary/llndk.libraries.28.txt:system/etc/llndk.libraries.28.txt:qcom \
     vendor/qcom/sargo/proprietary/cneapiclient.xml:system/etc/permissions/cneapiclient.xml:qcom \
-    vendor/qcom/sargo/proprietary/com.qualcomm.qti.imscmservice.xml:system/etc/permissions/com.qualcomm.qti.imscmservice.xml:qcom \
+    vendor/qcom/sargo/proprietary/com.google.android.factoryota.xml:system/etc/permissions/com.google.android.factoryota.xml:qcom \
     vendor/qcom/sargo/proprietary/com.quicinc.cne.xml:system/etc/permissions/com.quicinc.cne.xml:qcom \
     vendor/qcom/sargo/proprietary/embms.xml:system/etc/permissions/embms.xml:qcom \
     vendor/qcom/sargo/proprietary/lpa.xml:system/etc/permissions/lpa.xml:qcom \
@@ -37,9 +39,15 @@ PRODUCT_COPY_FILES := \
     vendor/qcom/sargo/proprietary/telephonyservice.xml:system/etc/permissions/telephonyservice.xml:qcom \
     vendor/qcom/sargo/proprietary/uimremoteclient.xml:system/etc/permissions/uimremoteclient.xml:qcom \
     vendor/qcom/sargo/proprietary/uimremoteserver.xml:system/etc/permissions/uimremoteserver.xml:qcom \
+    vendor/qcom/sargo/proprietary/UimService.xml:system/etc/permissions/UimService.xml:qcom \
+    vendor/qcom/sargo/proprietary/com.android.future.usb.accessory.jar:system/framework/com.android.future.usb.accessory.jar:qcom \
+    vendor/qcom/sargo/proprietary/com.android.location.provider.jar:system/framework/com.android.location.provider.jar:qcom \
+    vendor/qcom/sargo/proprietary/com.android.mediadrm.signer.jar:system/framework/com.android.mediadrm.signer.jar:qcom \
     vendor/qcom/sargo/proprietary/com.qualcomm.qti.uceservice-V2.0-java.jar:system/framework/com.qualcomm.qti.uceservice-V2.0-java.jar:qcom \
-    vendor/qcom/sargo/proprietary/embmslibrary.jar:system/framework/embmslibrary.jar:qcom \
+    vendor/qcom/sargo/proprietary/javax.obex.jar:system/framework/javax.obex.jar:qcom \
     vendor/qcom/sargo/proprietary/LteDirectDiscoveryLibrary.jar:system/framework/LteDirectDiscoveryLibrary.jar:qcom \
+    vendor/qcom/sargo/proprietary/org.apache.http.legacy.boot.jar:system/framework/org.apache.http.legacy.boot.jar:qcom \
+    vendor/qcom/sargo/proprietary/org.apache.http.legacy.boot.jar.prof:system/framework/org.apache.http.legacy.boot.jar.prof:qcom \
     vendor/qcom/sargo/proprietary/qcrilhook.jar:system/framework/qcrilhook.jar:qcom \
     vendor/qcom/sargo/proprietary/QtiTelephonyServicelibrary.jar:system/framework/QtiTelephonyServicelibrary.jar:qcom \
     vendor/qcom/sargo/proprietary/radioconfiginterfacelibrary.jar:system/framework/radioconfiginterfacelibrary.jar:qcom \
@@ -49,8 +57,15 @@ PRODUCT_COPY_FILES := \
     vendor/qcom/sargo/proprietary/uimremoteserverlibrary.jar:system/framework/uimremoteserverlibrary.jar:qcom \
     vendor/qcom/sargo/proprietary/uimremotesimlocklibrary.jar:system/framework/uimremotesimlocklibrary.jar:qcom \
     vendor/qcom/sargo/proprietary/vendor.qti.hardware.alarm-V1.0-java.jar:system/framework/vendor.qti.hardware.alarm-V1.0-java.jar:qcom \
-    vendor/qcom/sargo/proprietary/vendor.qti.hardware.data.latency-V1.0-java.jar:system/framework/vendor.qti.hardware.data.latency-V1.0-java.jar:qcom \
+    vendor/qcom/sargo/proprietary/vendor.qti.hardware.fingerprint-V1.0-java.jar:system/framework/vendor.qti.hardware.fingerprint-V1.0-java.jar:qcom \
+    vendor/qcom/sargo/proprietary/vendor.qti.hardware.soter-V1.0-java.jar:system/framework/vendor.qti.hardware.soter-V1.0-java.jar:qcom \
+    vendor/qcom/sargo/proprietary/lib64/libadsprpc_system.so:system/lib64/libadsprpc_system.so:qcom \
+    vendor/qcom/sargo/proprietary/lib64/libcdsprpc_system.so:system/lib64/libcdsprpc_system.so:qcom \
     vendor/qcom/sargo/proprietary/lib64/libDiagService.so:system/lib64/libDiagService.so:qcom \
+    vendor/qcom/sargo/proprietary/lib64/libdiag_system.so:system/lib64/libdiag_system.so:qcom \
+    vendor/qcom/sargo/proprietary/lib64/libdisplayconfig.so:system/lib64/libdisplayconfig.so:qcom \
+    vendor/qcom/sargo/proprietary/lib64/libGPQTEEC_system.so:system/lib64/libGPQTEEC_system.so:qcom \
+    vendor/qcom/sargo/proprietary/lib64/libGPTEE_system.so:system/lib64/libGPTEE_system.so:qcom \
     vendor/qcom/sargo/proprietary/lib64/libimscamera_jni.so:system/lib64/libimscamera_jni.so:qcom \
     vendor/qcom/sargo/proprietary/lib64/libimsmedia_jni.so:system/lib64/libimsmedia_jni.so:qcom \
     vendor/qcom/sargo/proprietary/lib64/lib-imsvideocodec.so:system/lib64/lib-imsvideocodec.so:qcom \
@@ -59,16 +74,25 @@ PRODUCT_COPY_FILES := \
     vendor/qcom/sargo/proprietary/lib64/lib-imsvtutils.so:system/lib64/lib-imsvtutils.so:qcom \
     vendor/qcom/sargo/proprietary/lib64/liblistenjni.so:system/lib64/liblistenjni.so:qcom \
     vendor/qcom/sargo/proprietary/lib64/liblistensoundmodel2.so:system/lib64/liblistensoundmodel2.so:qcom \
-    vendor/qcom/sargo/proprietary/lib64/libqcbor.so:system/lib64/libqcbor.so:qcom \
+    vendor/qcom/sargo/proprietary/lib64/liblogcat.so:system/lib64/liblogcat.so:qcom \
+    vendor/qcom/sargo/proprietary/lib64/libmdsprpc_system.so:system/lib64/libmdsprpc_system.so:qcom \
+    vendor/qcom/sargo/proprietary/lib64/libminui.so:system/lib64/libminui.so:qcom \
+    vendor/qcom/sargo/proprietary/lib64/libqsap_sdk.so:system/lib64/libqsap_sdk.so:qcom \
+    vendor/qcom/sargo/proprietary/lib64/libQTEEConnector_system.so:system/lib64/libQTEEConnector_system.so:qcom \
     vendor/qcom/sargo/proprietary/lib64/librcc.so:system/lib64/librcc.so:qcom \
     vendor/qcom/sargo/proprietary/lib64/libsdm-disp-apis.so:system/lib64/libsdm-disp-apis.so:qcom \
-    vendor/qcom/sargo/proprietary/lib64/libseccam.so:system/lib64/libseccam.so:qcom \
-    vendor/qcom/sargo/proprietary/lib64/libsecureuisvc_jni.so:system/lib64/libsecureuisvc_jni.so:qcom \
-    vendor/qcom/sargo/proprietary/lib64/libSeemplog.so:system/lib64/libSeemplog.so:qcom \
+    vendor/qcom/sargo/proprietary/lib64/libsdsprpc_system.so:system/lib64/libsdsprpc_system.so:qcom \
+    vendor/qcom/sargo/proprietary/lib64/libsecureui_svcsock_system.so:system/lib64/libsecureui_svcsock_system.so:qcom \
     vendor/qcom/sargo/proprietary/lib64/libsensorslog.so:system/lib64/libsensorslog.so:qcom \
-    vendor/qcom/sargo/proprietary/lib64/libsmcinvokecred.so:system/lib64/libsmcinvokecred.so:qcom \
+    vendor/qcom/sargo/proprietary/lib64/libsepol.so:system/lib64/libsepol.so:qcom \
     vendor/qcom/sargo/proprietary/lib64/libsns_low_lat_stream_stub.so:system/lib64/libsns_low_lat_stream_stub.so:qcom \
-    vendor/qcom/sargo/proprietary/lib64/libtzcom.so:system/lib64/libtzcom.so:qcom \
+    vendor/qcom/sargo/proprietary/lib64/libunwind.so:system/lib64/libunwind.so:qcom \
+    vendor/qcom/sargo/proprietary/libadsprpc_system.so:system/lib/libadsprpc_system.so:qcom \
+    vendor/qcom/sargo/proprietary/libcdsprpc_system.so:system/lib/libcdsprpc_system.so:qcom \
+    vendor/qcom/sargo/proprietary/libdiag_system.so:system/lib/libdiag_system.so:qcom \
+    vendor/qcom/sargo/proprietary/libdisplayconfig.so:system/lib/libdisplayconfig.so:qcom \
+    vendor/qcom/sargo/proprietary/libGPQTEEC_system.so:system/lib/libGPQTEEC_system.so:qcom \
+    vendor/qcom/sargo/proprietary/libGPTEE_system.so:system/lib/libGPTEE_system.so:qcom \
     vendor/qcom/sargo/proprietary/libimscamera_jni.so:system/lib/libimscamera_jni.so:qcom \
     vendor/qcom/sargo/proprietary/libimsmedia_jni.so:system/lib/libimsmedia_jni.so:qcom \
     vendor/qcom/sargo/proprietary/lib-imsvideocodec.so:system/lib/lib-imsvideocodec.so:qcom \
@@ -77,15 +101,19 @@ PRODUCT_COPY_FILES := \
     vendor/qcom/sargo/proprietary/lib-imsvtutils.so:system/lib/lib-imsvtutils.so:qcom \
     vendor/qcom/sargo/proprietary/liblistenjni.so:system/lib/liblistenjni.so:qcom \
     vendor/qcom/sargo/proprietary/liblistensoundmodel2.so:system/lib/liblistensoundmodel2.so:qcom \
-    vendor/qcom/sargo/proprietary/libqcbor.so:system/lib/libqcbor.so:qcom \
+    vendor/qcom/sargo/proprietary/liblogwrap.so:system/lib/liblogwrap.so:qcom \
+    vendor/qcom/sargo/proprietary/libmdsprpc_system.so:system/lib/libmdsprpc_system.so:qcom \
+    vendor/qcom/sargo/proprietary/libminui.so:system/lib/libminui.so:qcom \
+    vendor/qcom/sargo/proprietary/libnl.so:system/lib/libnl.so:qcom \
+    vendor/qcom/sargo/proprietary/libpac.so:system/lib/libpac.so:qcom \
     vendor/qcom/sargo/proprietary/libqct_resampler.so:system/lib/libqct_resampler.so:qcom \
+    vendor/qcom/sargo/proprietary/libqsap_sdk.so:system/lib/libqsap_sdk.so:qcom \
+    vendor/qcom/sargo/proprietary/libQTEEConnector_system.so:system/lib/libQTEEConnector_system.so:qcom \
     vendor/qcom/sargo/proprietary/librcc.so:system/lib/librcc.so:qcom \
     vendor/qcom/sargo/proprietary/libsdm-disp-apis.so:system/lib/libsdm-disp-apis.so:qcom \
-    vendor/qcom/sargo/proprietary/libseccam.so:system/lib/libseccam.so:qcom \
-    vendor/qcom/sargo/proprietary/libsecureuisvc_jni.so:system/lib/libsecureuisvc_jni.so:qcom \
-    vendor/qcom/sargo/proprietary/libSeemplog.so:system/lib/libSeemplog.so:qcom \
+    vendor/qcom/sargo/proprietary/libsdsprpc_system.so:system/lib/libsdsprpc_system.so:qcom \
+    vendor/qcom/sargo/proprietary/libsecureui_svcsock_system.so:system/lib/libsecureui_svcsock_system.so:qcom \
     vendor/qcom/sargo/proprietary/libsensorslog.so:system/lib/libsensorslog.so:qcom \
-    vendor/qcom/sargo/proprietary/libsmcinvokecred.so:system/lib/libsmcinvokecred.so:qcom \
     vendor/qcom/sargo/proprietary/libsns_low_lat_stream_stub.so:system/lib/libsns_low_lat_stream_stub.so:qcom \
-    vendor/qcom/sargo/proprietary/libtzcom.so:system/lib/libtzcom.so:qcom \
+    vendor/qcom/sargo/proprietary/libunwind.so:system/lib/libunwind.so:qcom \
     vendor/qcom/sargo/proprietary/libsns_low_lat_stream_skel.so:system/lib/rfsa/adsp/libsns_low_lat_stream_skel.so:qcom \
diff --git a/self-extractors_sargo/root/android-info.txt b/self-extractors_sargo/root/android-info.txt
index 59c3958c..c518a2b8 100644
--- a/self-extractors_sargo/root/android-info.txt
+++ b/self-extractors_sargo/root/android-info.txt
@@ -1,7 +1,6 @@
 require board=bonito|sargo
-require partition-exists=product
 
-require version-bootloader=b1c1-0.1-4768668
+require version-bootloader=b4s4-0.1-5027822
 
 
-require version-baseband=g845-00008-180429-B-4752067
+require version-baseband=g670-00019-180917-B-5013296