From 42da60142c3db01b05273672295d96426f2d498f Mon Sep 17 00:00:00 2001 From: Tad Date: Tue, 3 Apr 2018 09:10:49 -0400 Subject: [PATCH] 15.1: Many fixes --- .../proprietary-blobs.txt | 131 ++++++++++++++++++ .../0002-Remove_Analytics.patch | 28 ++++ Scripts/LineageOS-11.0/Deblob.sh | 2 +- Scripts/LineageOS-14.1/Deblob.sh | 2 +- Scripts/LineageOS-14.1/Rebrand.sh | 12 +- Scripts/LineageOS-15.1/Deblob.sh | 2 +- Scripts/LineageOS-15.1/Defaults.sh | 2 +- Scripts/LineageOS-15.1/Functions.sh | 2 +- Scripts/LineageOS-15.1/Optimize.sh | 2 +- Scripts/LineageOS-15.1/Patch.sh | 6 +- Scripts/LineageOS-15.1/Rebrand.sh | 17 ++- 11 files changed, 186 insertions(+), 20 deletions(-) create mode 100644 Patches/LineageOS-15.1/android_device_lge_mako/proprietary-blobs.txt create mode 100644 Patches/LineageOS-15.1/android_packages_apps_Settings/0002-Remove_Analytics.patch diff --git a/Patches/LineageOS-15.1/android_device_lge_mako/proprietary-blobs.txt b/Patches/LineageOS-15.1/android_device_lge_mako/proprietary-blobs.txt new file mode 100644 index 00000000..d104bc04 --- /dev/null +++ b/Patches/LineageOS-15.1/android_device_lge_mako/proprietary-blobs.txt @@ -0,0 +1,131 @@ +vendor/bin/efsks +vendor/bin/hci_qcomm_init +vendor/bin/ks +vendor/bin/mm-qcamera-daemon +vendor/bin/netmgrd +vendor/bin/qcks +vendor/bin/qmuxd +vendor/bin/qseecomd +vendor/bin/rmt_storage +vendor/bin/sensors.qcom +vendor/firmware/a300_pfp.fw +vendor/firmware/a300_pm4.fw +vendor/firmware/bcm2079x_firmware.ncd +vendor/firmware/bcm2079x_pre_firmware.ncd +vendor/firmware/discretix/dxhdcp2.b00 +vendor/firmware/discretix/dxhdcp2.b01 +vendor/firmware/discretix/dxhdcp2.b02 +vendor/firmware/discretix/dxhdcp2.b03 +vendor/firmware/discretix/dxhdcp2.mdt +vendor/firmware/dsps.b00 +vendor/firmware/dsps.b01 +vendor/firmware/dsps.b02 +vendor/firmware/dsps.b03 +vendor/firmware/dsps.b04 +vendor/firmware/dsps.b05 +vendor/firmware/dsps.mdt +vendor/firmware/keymaster/keymaster.b00 +vendor/firmware/keymaster/keymaster.b01 +vendor/firmware/keymaster/keymaster.b02 +vendor/firmware/keymaster/keymaster.b03 +vendor/firmware/keymaster/keymaster.mdt +vendor/firmware/q6.b00 +vendor/firmware/q6.b01 +vendor/firmware/q6.b03 +vendor/firmware/q6.b04 +vendor/firmware/q6.b05 +vendor/firmware/q6.b06 +vendor/firmware/q6.mdt +vendor/firmware/tzapps.b00 +vendor/firmware/tzapps.b01 +vendor/firmware/tzapps.b02 +vendor/firmware/tzapps.b03 +vendor/firmware/tzapps.mdt +vendor/firmware/vidc_1080p.fw +vendor/firmware/vidc.b00 +vendor/firmware/vidc.b01 +vendor/firmware/vidc.b02 +vendor/firmware/vidc.b03 +vendor/firmware/vidc.mdt +vendor/firmware/wcnss.b00 +vendor/firmware/wcnss.b01 +vendor/firmware/wcnss.b02 +vendor/firmware/wcnss.b04 +vendor/firmware/wcnss.b05 +vendor/firmware/wcnss.mdt +vendor/lib/egl/eglsubAndroid.so +vendor/lib/egl/libEGL_adreno.so +vendor/lib/egl/libGLESv1_CM_adreno.so +vendor/lib/egl/libGLESv2_adreno.so +vendor/lib/egl/libq3dtools_adreno.so +vendor/lib/hw/flp.msm8960.so +vendor/lib/libacdbdata.so +vendor/lib/libacdbloader.so +vendor/lib/libadreno_utils.so +vendor/lib/libAKM.so +vendor/lib/libaudcal.so +vendor/lib/libbccQTI.so +vendor/lib/libC2D2.so +vendor/lib/libc2d30-a3xx.so +vendor/lib/libcamera_fast_af.so +vendor/lib/libCB.so +vendor/lib/libchromatix_imx111_default_video.so +vendor/lib/libchromatix_imx111_preview.so +vendor/lib/libchromatix_imx111_zsl.so +vendor/lib/libchromatix_imx119_default_video.so +vendor/lib/libchromatix_imx119_preview.so +vendor/lib/libcsd-client.so +vendor/lib/libdiag.so +vendor/lib/libdrmfs.so +vendor/lib/libdrmtime.so +vendor/lib/libdsi_netctrl.so +vendor/lib/libdsutils.so +vendor/lib/libDxHdcp.so +vendor/lib/libgemini.so +vendor/lib/libgeofence.so +vendor/lib/libgsl.so +vendor/lib/libidl.so +vendor/lib/libimage-jpeg-dec-omx-comp.so +vendor/lib/libimage-jpeg-enc-omx-comp.so +vendor/lib/libimage-omx-common.so +vendor/lib/libizat_core.so +vendor/lib/libllvm-qcom.so +vendor/lib/libloc_api_v02.so +vendor/lib/libloc_ds_api.so +vendor/lib/libmercury.so +vendor/lib/libmmcamera_faceproc.so +vendor/lib/libmmcamera_frameproc.so +vendor/lib/libmmcamera_hdr_lib.so +vendor/lib/libmmcamera_image_stab.so +vendor/lib/libmmcamera_statsproc31.so +vendor/lib/libmmcamera_wavelet_lib.so +vendor/lib/libmmjpeg.so +vendor/lib/libmmmpod.so +vendor/lib/libmmmpo.so +vendor/lib/libmmstillomx.so +vendor/lib/libmorpho_noise_reduction.so +vendor/lib/libnetmgr.so +vendor/lib/liboemcamera.so +vendor/lib/liboemcrypto.so +vendor/lib/libqcci_legacy.so +vendor/lib/libqdi.so +vendor/lib/libqdp.so +vendor/lib/libqmi_cci.so +vendor/lib/libqmi_client_qmux.so +vendor/lib/libqmi_common_so.so +vendor/lib/libqmi_csi.so +vendor/lib/libqmi_encdec.so +vendor/lib/libqmiservices.so +vendor/lib/libqmi.so +vendor/lib/libQSEEComAPI.so +vendor/lib/libril-qc-qmi-1.so +vendor/lib/libril-qcril-hook-oem.so +vendor/lib/librs_adreno_sha1.so +vendor/lib/librs_adreno.so +vendor/lib/libRSDriver_adreno.so +vendor/lib/libsc-a3xx.so +vendor/lib/libsensor1.so +vendor/lib/libsensor_reg.so +vendor/lib/libstagefright_hdcp.so +vendor/lib/mediadrm/libwvdrmengine.so +vendor/lib/sensors.mako.so diff --git a/Patches/LineageOS-15.1/android_packages_apps_Settings/0002-Remove_Analytics.patch b/Patches/LineageOS-15.1/android_packages_apps_Settings/0002-Remove_Analytics.patch new file mode 100644 index 00000000..29ad68c7 --- /dev/null +++ b/Patches/LineageOS-15.1/android_packages_apps_Settings/0002-Remove_Analytics.patch @@ -0,0 +1,28 @@ +From c126761d730a09326ea67bdfbd06023dc96e55cc Mon Sep 17 00:00:00 2001 +From: Tad +Date: Tue, 3 Apr 2018 08:49:01 -0400 +Subject: [PATCH] Remove Lineage stats + +Change-Id: I6f0a91e8d64f4b9b4f649d70f8fbc0a5f1250c48 +--- + res/xml/security_settings_misc.xml | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/res/xml/security_settings_misc.xml b/res/xml/security_settings_misc.xml +index 1ea99739b4..3dcc597fbf 100644 +--- a/res/xml/security_settings_misc.xml ++++ b/res/xml/security_settings_misc.xml +@@ -36,10 +36,6 @@ + android:title="@string/show_password" + android:summary="@string/show_password_summary"/> + +- +- +- + + + +-- +2.16.3 + diff --git a/Scripts/LineageOS-11.0/Deblob.sh b/Scripts/LineageOS-11.0/Deblob.sh index 47747690..686a2dcd 100755 --- a/Scripts/LineageOS-11.0/Deblob.sh +++ b/Scripts/LineageOS-11.0/Deblob.sh @@ -22,7 +22,7 @@ # #Device Status (Tested under LineageOS 14.1) # -#Functioning as Expected: bacon, clark, mako, marlin, sailfish, thor +#Functioning as Expected: bacon, clark, d852, mako, marlin, thor echo "Deblobbing..." diff --git a/Scripts/LineageOS-14.1/Deblob.sh b/Scripts/LineageOS-14.1/Deblob.sh index 47747690..686a2dcd 100755 --- a/Scripts/LineageOS-14.1/Deblob.sh +++ b/Scripts/LineageOS-14.1/Deblob.sh @@ -22,7 +22,7 @@ # #Device Status (Tested under LineageOS 14.1) # -#Functioning as Expected: bacon, clark, mako, marlin, sailfish, thor +#Functioning as Expected: bacon, clark, d852, mako, marlin, thor echo "Deblobbing..." diff --git a/Scripts/LineageOS-14.1/Rebrand.sh b/Scripts/LineageOS-14.1/Rebrand.sh index 825550a4..d85603fe 100644 --- a/Scripts/LineageOS-14.1/Rebrand.sh +++ b/Scripts/LineageOS-14.1/Rebrand.sh @@ -28,18 +28,18 @@ sed -i 's|echo "ro.build.host=`hostname`"|echo "ro.build.host=dosbm"|' tools/bui sed -i '/CM_TARGET_PACKAGE/s/lineage/coverage/' core/Makefile; enter "packages/apps/Settings" -sed -i '/.*cmlicense_title/s/LineageOS/DivestOS/' res/values*/cm_strings.xml -sed -i '/.*cmupdate_settings_title/s/LineageOS/DivestOS/' res/values*/cm_strings.xml -sed -i '/.*mod_version/s/LineageOS/DivestOS/' res/values*/cm_strings.xml +sed -i '/.*cmlicense_title/s/LineageOS/DivestOS/' res/values*/cm_strings.xml; +sed -i '/.*cmupdate_settings_title/s/LineageOS/DivestOS/' res/values*/cm_strings.xml; +sed -i '/.*mod_version/s/LineageOS/DivestOS/' res/values*/cm_strings.xml; enter "packages/apps/SetupWizard" sed -i 's|http://lineageos.org/legal|https://divestos.xyz/pages/legal/pp.html|' src/com/cyanogenmod/setupwizard/LineageSettingsActivity.java; -sed -i '/.*setup_services/s/LineageOS/DivestOS/' res/values*/strings.xml -sed -i '/.*services_explanation/s/LineageOS/DivestOS/' res/values*/strings.xml +sed -i '/.*setup_services/s/LineageOS/DivestOS/' res/values*/strings.xml; +sed -i '/.*services_explanation/s/LineageOS/DivestOS/' res/values*/strings.xml; cp $patches"android_packages_apps_SetupWizard/logo.xml" "res/drawable/logo.xml"; #Replace Lineage logo with ours enter "packages/apps/Updater" -sed -i 's|>LineageOS|>DivestOS|' res/values*/strings.xml +sed -i 's|>LineageOS|>DivestOS|' res/values*/strings.xml; enter "vendor/cm" sed -i 's|https://lineageos.org/legal|https://divestos.xyz/pages/about.html|' config/common.mk; diff --git a/Scripts/LineageOS-15.1/Deblob.sh b/Scripts/LineageOS-15.1/Deblob.sh index 731e6b6a..7c69721e 100755 --- a/Scripts/LineageOS-15.1/Deblob.sh +++ b/Scripts/LineageOS-15.1/Deblob.sh @@ -22,7 +22,7 @@ # #Device Status (Tested under LineageOS 14.1) # -#Functioning as Expected: bacon, clark, mako, marlin, sailfish, thor +#Functioning as Expected: bacon, clark, d852, mako, marlin, thor echo "Deblobbing..." diff --git a/Scripts/LineageOS-15.1/Defaults.sh b/Scripts/LineageOS-15.1/Defaults.sh index 3c3ec1c0..75338f5e 100644 --- a/Scripts/LineageOS-15.1/Defaults.sh +++ b/Scripts/LineageOS-15.1/Defaults.sh @@ -20,7 +20,7 @@ echo "Changing default settings..." enter "frameworks/base" -sed -i '0,/wifi,cell,battery/s/wifi,cell,battery,dnd,flashlight,rotation,bt,airplane/wifi,cell,bt,dnd,flashlight,rotation,battery,profiles,location,airplane,saver,hotspot,nfc/' packages/SystemUI/res/values/config.xml; #Default quick tiles +sed -i '0,/wifi,bt,dnd,flashlight/s/wifi,bt,dnd,flashlight,rotation,battery,cell,airplane,cast/wifi,cell,bt,dnd,flashlight,rotation,battery,sync,location,airplane,saver,hotspot,nfc/' packages/SystemUI/res/values/config.xml; #Default quick tiles #sed -i 's|config_longPressOnHomeBehavior">2|config_longPressOnHomeBehavior">0|' core/res/res/values/config.xml; #Set long press home to do nothing #sed -i 's|config_doubleTapOnHomeBehavior">0|config_doubleTapOnHomeBehavior">8|' core/res/res/values/config.xml; #Set double tap home to switch to last app diff --git a/Scripts/LineageOS-15.1/Functions.sh b/Scripts/LineageOS-15.1/Functions.sh index 76d47038..a7618fd0 100644 --- a/Scripts/LineageOS-15.1/Functions.sh +++ b/Scripts/LineageOS-15.1/Functions.sh @@ -58,9 +58,9 @@ export -f buildDevice; buildAll() { #Select devices are userdebug due to SELinux policy issues #TODO: Add victara, griffin, athene, us997, us996, pme, t0lte, hlte + brunch lineage_mako-user; brunch lineage_d852-userdebug; brunch lineage_bacon-user; - #brunch lineage_mako-user; #brunch lineage_clark-user; #requires blobs from https://androidfilehost.com/?w=files&flid=244563 and also broken brunch lineage_angler-user; brunch lineage_bullhead-user; diff --git a/Scripts/LineageOS-15.1/Optimize.sh b/Scripts/LineageOS-15.1/Optimize.sh index f1a92df0..f98ba4d6 100644 --- a/Scripts/LineageOS-15.1/Optimize.sh +++ b/Scripts/LineageOS-15.1/Optimize.sh @@ -20,7 +20,7 @@ echo "Optimizing..." enter "frameworks/base" -sed -i 's/ScaleSetting = 1.0f;/ScaleSetting = 0.5f;/' services/core/java/com/android/server/wm/WindowManagerService.java; +sed -i 's/ScaleSetting = 1.0f;/ScaleSetting = 0.5f;/' services/core/java/com/android/server/wm/WindowManagerService.java; #TODO: Fix transition scale sed -i 's|config_useVolumeKeySounds">true|config_useVolumeKeySounds">false|' core/res/res/values/config.xml; sed -i 's|config_radioScanningTimeout">0|config_radioScanningTimeout">300000|' core/res/res/values/config.xml; sed -i 's|config_wifi_fast_bss_transition_enabled">false|config_wifi_fast_bss_transition_enabled">true|' core/res/res/values/config.xml; diff --git a/Scripts/LineageOS-15.1/Patch.sh b/Scripts/LineageOS-15.1/Patch.sh index c21defcb..d1fadf8e 100755 --- a/Scripts/LineageOS-15.1/Patch.sh +++ b/Scripts/LineageOS-15.1/Patch.sh @@ -62,7 +62,7 @@ cp -r $prebuiltApps"android_vendor_FDroid_PrebuiltApps/." $base"vendor/fdroid_pr #optipng -strip all res*/images/*.png; enterAndClear "build/make" -patch -p1 < $patches"android_build/0001-Automated_Build_Signing.patch" #Automated build signing. Disclaimer: From CopperheadOS 13.0 +patch -p1 < $patches"android_build/0001-Automated_Build_Signing.patch" #Automated build signing. Disclaimer: From CopperheadOS 13.0 #TODO: Fix showing test-keys awk -i inplace '!/PRODUCT_EXTRA_RECOVERY_KEYS/' core/product.mk; sed -i 's/messaging/Silence/' target/product/*.mk; #Replace AOSP Messaging app with Silence @@ -129,6 +129,7 @@ git revert a96df110e84123fe1273bff54feca3b4ca484dcd sed -i 's/private int mPasswordMaxLength = 16;/private int mPasswordMaxLength = 48;/' src/com/android/settings/password/ChooseLockPassword.java; #Increase max password length sed -i 's/GSETTINGS_PROVIDER = "com.google.settings";/GSETTINGS_PROVIDER = "com.google.oQuae4av";/' src/com/android/settings/PrivacySettings.java; #MicroG doesn't support Backup, hide the options #patch -p1 < $patches"android_packages_apps_Settings/0001-Privacy_Guard-More_Perms.patch" #Allow more control over various permissions via Privacy Guard #TODO: Rebase +patch -p1 < $patches"android_packages_apps_Settings/0002-Remove_Analytics.patch" #Remove analytics enterAndClear "packages/apps/SetupWizard" patch -p1 < $patches"android_packages_apps_SetupWizard/0001-Remove_Analytics.patch" #Remove analytics @@ -175,6 +176,9 @@ sed -i 's/config_enableRecoveryUpdater">false/config_enableRecoveryUpdater">true # #START OF DEVICE CHANGES # +enterAndClear "device/lge/mako" +cp $patches"android_device_lge_mako/proprietary-blobs.txt" proprietary-blobs.txt; #update that? nah + enterAndClear "device/oppo/msm8974-common" sed -i "s/TZ.BF.2.0-2.0.0134/TZ.BF.2.0-2.0.0134|TZ.BF.2.0-2.0.0137/" board-info.txt; #Suport new TZ firmware https://review.lineageos.org/#/c/178999/ diff --git a/Scripts/LineageOS-15.1/Rebrand.sh b/Scripts/LineageOS-15.1/Rebrand.sh index 67c4f493..81c26bac 100644 --- a/Scripts/LineageOS-15.1/Rebrand.sh +++ b/Scripts/LineageOS-15.1/Rebrand.sh @@ -26,24 +26,27 @@ enter "build/make" sed -i 's|echo "ro.build.user=$USER"|echo "ro.build.user=emy"|' tools/buildinfo.sh; #Override build user sed -i 's|echo "ro.build.host=`hostname`"|echo "ro.build.host=dosbm"|' tools/buildinfo.sh; #Override build host +enter "lineage-sdk" +sed -i '/.*lineage_version/s/LineageOS/DivestOS/' lineage/res/res/values*/strings.xml; +sed -i '/.*lineage_updates/s/LineageOS/DivestOS/' lineage/res/res/values*/strings.xml; +sed -i '/.*lineageos_system_label/s/LineageOS/DivestOS/' lineage/res/res/values*/strings.xml; + enter "packages/apps/Settings" -sed -i '/.*lineagelicense_title/s/LineageOS/DivestOS/' res/values*/cm_strings.xml -#sed -i '/.*cmupdate_settings_title/s/LineageOS/DivestOS/' res/values*/cm_strings.xml -#sed -i '/.*mod_version/s/LineageOS/DivestOS/' res/values*/cm_strings.xml +sed -i '/.*lineagelicense_title/s/LineageOS/DivestOS/' res/values*/cm_strings.xml; enter "packages/apps/SetupWizard" sed -i 's|http://lineageos.org/legal|https://divestos.xyz/pages/legal/pp.html|' src/org/lineageos/setupwizard/LineageSettingsActivity.java; -sed -i '/.*setup_services/s/LineageOS/DivestOS/' res/values*/strings.xml -sed -i '/.*services_explanation/s/LineageOS/DivestOS/' res/values*/strings.xml +sed -i '/.*setup_services/s/LineageOS/DivestOS/' res/values*/strings.xml; +sed -i '/.*services_explanation/s/LineageOS/DivestOS/' res/values*/strings.xml; cp $patches"android_packages_apps_SetupWizard/logo.xml" "res/drawable/logo.xml"; #Replace Lineage logo with ours enter "packages/apps/Updater" -sed -i 's|>LineageOS|>DivestOS|' res/values*/strings.xml +sed -i 's|>LineageOS|>DivestOS|' res/values*/strings.xml; enter "vendor/lineage" sed -i 's|https://lineageos.org/legal|https://divestos.xyz/pages/about.html|' config/common.mk; sed -i '/.*ZIPPATH=/s/lineage/coverage/' build/envsetup.sh; -sed -i '/LINEAGE_TARGET_PACKAGE/s/lineage/coverage/' build/tasks/bacon.mk +sed -i '/LINEAGE_TARGET_PACKAGE/s/lineage/coverage/' build/tasks/bacon.mk; rm -rf bootanimation #TODO: Create a boot animation cd $base