diff --git a/Scripts/Common/Deblob.sh b/Scripts/Common/Deblob.sh index e87880e9..b5c1cc79 100644 --- a/Scripts/Common/Deblob.sh +++ b/Scripts/Common/Deblob.sh @@ -252,9 +252,10 @@ echo "Deblobbing..." #IMS (VoLTE/Wi-Fi Calling) [Qualcomm] if [ "$DOS_DEBLOBBER_REMOVE_IMS" = true ]; then - blobs=$blobs"|lib-imsdpl.so|lib-imscamera.so|libimscamera_jni.so|lib-imsqimf.so|lib-imsSDP.so|lib-imss.so|lib-imsvt.so|lib-imsxml.so|lib-imsvideocodec.so|lib-imsvtextutils.so|lib-imsvtutils.so|libimsmedia_jni.so|vendor.qti.hardware.radio.ims.*"; + #blobs=$blobs"|libimsmedia_jni.so|vendor.qti.hardware.radio.ims.*"; + blobs=$blobs"|lib-imsdpl.so|lib-imscamera.so|libimscamera_jni.so|lib-imsqimf.so|lib-imsSDP.so|lib-imss.so|lib-imsvt.so|lib-imsxml.so|lib-imsvideocodec.so|lib-imsvtextutils.so|lib-imsvtutils.so"; blobs=$blobs"|imscmservice|imsdatadaemon|imsqmidaemon"; - blobs=$blobs"|imscm.xml|ims.xml"; + blobs=$blobs"|imscm.xml|ims.xml|android.hardware.telephony.ims.xml"; blobs=$blobs"|qti_permissions.xml"; blobs=$blobs"|imssettings.apk|ims.apk"; blobs=$blobs"|imscmlibrary.jar"; @@ -337,7 +338,7 @@ echo "Deblobbing..." blobs=$blobs"|libdme_main.so|libwbxmlparser.so|libprovlib.so"; blobs=$blobs"|dm_agent|dm_agent_binder"; blobs=$blobs"|npsmobex"; #Samsung? - blobs=$blobs"|ConnMO.apk|OmaDmclient.apk|com.android.omadm.service.xml|DCMO.apk|DiagMon.apk|DMConfigUpdate.apk|DMService.apk|libdmengine.so|libdmjavaplugin.so|SprintDM.apk|SDM.apk|whitelist_com.android.omadm.service.xml|com.android.sdm.plugins.connmo.xml|com.android.sdm.plugins.sprintdm.xml|com.google.omadm.trigger.xml"; #Sprint + blobs=$blobs"|ConnMO.apk|OmaDmclient.apk|com.android.omadm.service.xml|DCMO.apk|DiagMon.apk|DMConfigUpdate.apk|DMService.apk|libdmengine.so|libdmjavaplugin.so|SprintDM.apk|SDM.apk|whitelist_com.android.omadm.service.xml|com.android.sdm.plugins.connmo.xml|com.android.sdm.plugins.sprintdm.xml|com.google.omadm.trigger.xml|com.android.sdm.plugins.diagmon.xml|com.android.sdm.plugins.dcmo.xml"; #Sprint #OpenMobileAPI [SIM Alliance] #This is open source, but rarely used @@ -436,7 +437,7 @@ echo "Deblobbing..." blobs=$blobs"|libmotricity.so|libakuaf.so"; blobs=$blobs"|com.qualcomm.location.vzw_library.jar|com.verizon.hardware.telephony.ehrpd.jar|com.verizon.hardware.telephony.lte.jar|com.verizon.ims.jar|qti-vzw-ims-internal.jar|VerizonUnifiedSettings.jar"; blobs=$blobs"|CarrierSetup.apk|OemDmTrigger.apk|appdirectedsmspermission.apk|VerizonSSOEngine.apk|VZWAPNLib.apk|vzwapnpermission.apk|VZWAPNService.apk|VZWAVS.apk|VzwLcSilent.apk|vzw_msdc_api.apk|VzwOmaTrigger.apk|VerizonAuthDialog.apk|MyVerizonServices.apk|WfcActivation.apk|obdm_stub.apk|QAS_DVC_MSP.*.apk"; - blobs=$blobs"|com.android.vzwomatrigger.xml|vzw_mvs_permissions.xml|obdm_permissions.xml|com.verizon.services.xml|features-verizon.xml|com.qualcomm.location.vzw_library.xml|com.verizon.apn.xml|com.verizon.embms.xml|com.verizon.hardware.telephony.ehrpd.xml|com.verizon.hardware.telephony.lte.xml|com.verizon.ims.xml|com.verizon.provider.xml|com.vzw.vzwapnlib.xml|qti-vzw-ims-internal.xml|vzw_sso_permissions.xml|com.vzw.hardware.lte.xml|com.vzw.hardware.ehrpd.xml|verizon_config_params.txt|com.verizon.llkagent.xml"; + blobs=$blobs"|com.android.vzwomatrigger.xml|vzw_mvs_permissions.xml|obdm_permissions.xml|com.verizon.services.xml|features-verizon.xml|com.qualcomm.location.vzw_library.xml|com.verizon.apn.xml|com.verizon.embms.xml|com.verizon.hardware.telephony.ehrpd.xml|com.verizon.hardware.telephony.lte.xml|com.verizon.ims.xml|com.verizon.provider.xml|com.vzw.vzwapnlib.xml|qti-vzw-ims-internal.xml|vzw_sso_permissions.xml|com.vzw.hardware.lte.xml|com.vzw.hardware.ehrpd.xml|verizon_config_params.txt|com.verizon.llkagent.xml|vzw_mvs_sysconfig.xml"; #Voice Recognition blobs=$blobs"|liblistenhardware.so|liblistenjni.so|liblisten.so|liblistensoundmodel.*.so|libqvop-service.so|librecoglib.so|libsupermodel.so|libtrainingcheck.so"; @@ -464,7 +465,7 @@ echo "Deblobbing..." blobs=$blobs"|com.google.widevine.software.drm.xml"; #blobs=$blobs"|smc_pa_wvdrm.ift"; breaks toro boot blobs=$blobs"|tzwidevine.*|tzwvcpybuf.*|widevine.*"; - makes=$makes"|libshim_wvm"; + makes=$makes"|libshim_wvm|move_widevine_data.sh"; #WiPower (Wireless Charging) [Qualcomm] blobs=$blobs"|libwbc_jni.so|wbc_hal.default.so"; diff --git a/Scripts/Common/Functions.sh b/Scripts/Common/Functions.sh index b5e078fc..cca8424a 100644 --- a/Scripts/Common/Functions.sh +++ b/Scripts/Common/Functions.sh @@ -250,6 +250,7 @@ processRelease() { cp -v $OUT_DIR/$PREFIX-ota.zip* $ARCHIVE/; cp -v $OUT_DIR/$PREFIX-incremental_*.zip* $ARCHIVE/incrementals/ || true; cp -v $OUT_DIR/$PREFIX-recovery.img $ARCHIVE/ || true; + sync; #Remove to make space for next build if [ "$DOS_REMOVE_AFTER" = true ]; then diff --git a/Scripts/LineageOS-16.0/Functions.sh b/Scripts/LineageOS-16.0/Functions.sh index 30cbf97b..7cbb55fe 100644 --- a/Scripts/LineageOS-16.0/Functions.sh +++ b/Scripts/LineageOS-16.0/Functions.sh @@ -60,12 +60,9 @@ buildAll() { #SD410 buildDevice crackling; #SD800 - buildDevice d802; buildDevice hammerhead; #broken #SD801 buildDevice bacon; - buildDevice d852; - buildDevice d855; buildDevice ham; buildDevice klte; buildDevice victara; @@ -104,7 +101,11 @@ buildAll() { buildDevice mako; #SD600 buildDevice jfltexx; + #SD800 + buildDevice d802; #SD801 + buildDevice d852; + buildDevice d855; buildDevice FP2; buildDevice m8; #SD805 diff --git a/Scripts/LineageOS-17.1/Functions.sh b/Scripts/LineageOS-17.1/Functions.sh index 9945d71e..9d1ef3b8 100644 --- a/Scripts/LineageOS-17.1/Functions.sh +++ b/Scripts/LineageOS-17.1/Functions.sh @@ -86,8 +86,7 @@ export -f buildAll; patchWorkspace() { if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanForMalware false "$DOS_PREBUILT_APPS $DOS_BUILD_BASE/build $DOS_BUILD_BASE/device $DOS_BUILD_BASE/vendor/lineage"; fi; - source build/envsetup.sh; - repopick -it g3-crypt; + #source build/envsetup.sh; source "$DOS_SCRIPTS/Patch.sh"; source "$DOS_SCRIPTS/Defaults.sh"; diff --git a/Scripts/LineageOS-17.1/Patch.sh b/Scripts/LineageOS-17.1/Patch.sh index 2249c07d..36dbf12e 100644 --- a/Scripts/LineageOS-17.1/Patch.sh +++ b/Scripts/LineageOS-17.1/Patch.sh @@ -196,9 +196,6 @@ echo "PRODUCT_PACKAGES += vendor.lineage.trust@1.0-service" >> packages.mk; #All # #START OF DEVICE CHANGES # -enterAndClear "device/essential/mata"; -patch -p1 < "$DOS_PATCHES_COMMON/android_device_audio/0001-No_Vorbis_Offload.patch"; #Fix Ogg Vorbis playback - enterAndClear "device/google/marlin"; git revert --no-edit 777dafa35f185b1f501e3c80b8ab495191583444; #remove some carrier blobs diff --git a/Scripts/init.sh b/Scripts/init.sh index a8c1db93..54117e7e 100644 --- a/Scripts/init.sh +++ b/Scripts/init.sh @@ -41,7 +41,7 @@ export DOS_DEBLOBBER_REMOVE_AUDIOFX=true; #Set true to remove AudioFX export DOS_DEBLOBBER_REMOVE_GRAPHICS=false; #Set true to remove all graphics blobs and use SwiftShader CPU renderer #TODO: Needs work export DOS_DEBLOBBER_REMOVE_RENDERSCRIPT=false; #Set true to remove RenderScript blobs export DOS_DEBLOBBER_REMOVE_FP=false; #Set true to remove all fingerprint reader blobs -export DOS_DEBLOBBER_REMOVE_IMS=false; #Set true to remove all IMS blobs XXX: Will break compat with select carriers +export DOS_DEBLOBBER_REMOVE_IMS=true; #Set true to remove all IMS blobs XXX: Will break compat with select carriers export DOS_DEBLOBBER_REMOVE_IPA=false; #Set true to remove all IPA blobs export DOS_DEBLOBBER_REMOVE_IR=false; #Set true to remove all IR blobs export DOS_DEBLOBBER_REPLACE_TIME=false; #Set true to replace Qualcomm Time Services with the open source Sony TimeKeep reimplementation #TODO: Needs work