From 62cba6a878645b48f8049fbef9d68681462573f5 Mon Sep 17 00:00:00 2001 From: Tad Date: Sat, 20 Mar 2021 16:15:01 -0400 Subject: [PATCH] More cleanup --- Scripts/Common/Functions.sh | 2 +- Scripts/LineageOS-14.1/Functions.sh | 4 +--- Scripts/LineageOS-15.1/Functions.sh | 7 +------ Scripts/LineageOS-15.1/Patch.sh | 5 +---- Scripts/LineageOS-16.0/Functions.sh | 5 ----- Scripts/LineageOS-16.0/Patch.sh | 1 - Scripts/init.sh | 1 - 7 files changed, 4 insertions(+), 21 deletions(-) diff --git a/Scripts/Common/Functions.sh b/Scripts/Common/Functions.sh index 9dd4c2b4..7cf54c6d 100644 --- a/Scripts/Common/Functions.sh +++ b/Scripts/Common/Functions.sh @@ -86,7 +86,7 @@ scanForMalware() { fi; fi; du -hsc $scanQueue; - /usr/bin/clamscan --recursive --detect-pua --infected --allmatch $excludes $scanQueue; + /usr/bin/clamscan --recursive --detect-pua --infected --allmatch --max-filesize=4000M --max-scansize=4000M $excludes $scanQueue; local clamscanExit="$?"; if [ "$clamscanExit" -eq "1" ]; then echo -e "\e[0;31m----------------------------------------------------------------\e[0m"; diff --git a/Scripts/LineageOS-14.1/Functions.sh b/Scripts/LineageOS-14.1/Functions.sh index 6bbb967d..4450077e 100644 --- a/Scripts/LineageOS-14.1/Functions.sh +++ b/Scripts/LineageOS-14.1/Functions.sh @@ -113,15 +113,13 @@ patchWorkspace() { #Deblobbing fixes ##setup-makefiles doesn't execute properly for some devices, running it twice seems to fix whatever is wrong cd device/asus/Z00T && ./setup-makefiles.sh && cd "$DOS_BUILD_BASE"; - cd device/lge/h850 && ./setup-makefiles.sh && cd "$DOS_BUILD_BASE"; - cd device/lge/rs988 && ./setup-makefiles.sh && cd "$DOS_BUILD_BASE"; } export -f patchWorkspace; enableDexPreOpt() { cd "$DOS_BUILD_BASE$1"; #Some devices won't compile, or have too small of a /system partition, or Wi-Fi breaks - if [ "$1" != "device/amazon/thor" ] && [ "$1" != "device/samsung/i9100" ] && [ "$1" != "device/samsung/maguro" ] && [ "$1" != "device/samsung/toro" ] && [ "$1" != "device/samsung/toroplus" ] && [ "$1" != "device/samsung/tuna" ] && [ "$1" != "device/lge/h850" ] && [ "$1" != "device/lge/rs988" ] && [ "$1" != "device/lge/mako" ] && [ "$1" != "device/asus/grouper" ]; then + if [ "$1" != "device/amazon/thor" ] && [ "$1" != "device/samsung/i9100" ] && [ "$1" != "device/samsung/maguro" ] && [ "$1" != "device/samsung/toro" ] && [ "$1" != "device/samsung/toroplus" ] && [ "$1" != "device/samsung/tuna" ] && [ "$1" != "device/asus/grouper" ]; then if [ -f BoardConfig.mk ]; then echo "WITH_DEXPREOPT := true" >> BoardConfig.mk; echo "WITH_DEXPREOPT_PIC := true" >> BoardConfig.mk; diff --git a/Scripts/LineageOS-15.1/Functions.sh b/Scripts/LineageOS-15.1/Functions.sh index 26c48475..f9c1e26a 100644 --- a/Scripts/LineageOS-15.1/Functions.sh +++ b/Scripts/LineageOS-15.1/Functions.sh @@ -102,18 +102,13 @@ patchWorkspace() { source "$DOS_SCRIPTS_COMMON/Deblob.sh"; source "$DOS_SCRIPTS_COMMON/Patch_CVE.sh"; source build/envsetup.sh; - - #Deblobbing fixes - ##setup-makefiles doesn't execute properly for some devices, running it twice seems to fix whatever is wrong - cd device/lge/h850 && ./setup-makefiles.sh && cd "$DOS_BUILD_BASE"; - cd device/lge/rs988 && ./setup-makefiles.sh && cd "$DOS_BUILD_BASE"; } export -f patchWorkspace; enableDexPreOpt() { cd "$DOS_BUILD_BASE$1"; #Some devices won't compile, or have too small of a /system partition, or Wi-Fi breaks - if [ "$1" != "device/lge/h850" ] && [ "$1" != "device/lge/rs988" ] && [ "$1" != "device/lge/mako" ]; then + if true; then if [ -f BoardConfig.mk ]; then echo "WITH_DEXPREOPT := true" >> BoardConfig.mk; echo "WITH_DEXPREOPT_PIC := true" >> BoardConfig.mk; diff --git a/Scripts/LineageOS-15.1/Patch.sh b/Scripts/LineageOS-15.1/Patch.sh index b01f0bd0..0d0a0f3e 100644 --- a/Scripts/LineageOS-15.1/Patch.sh +++ b/Scripts/LineageOS-15.1/Patch.sh @@ -232,13 +232,10 @@ if [ "$DOS_HOSTS_BLOCKING" = false ]; then echo "PRODUCT_PACKAGES += $DOS_HOSTS_ enterAndClear "device/asus/msm8916-common"; rm -rf Android.bp sensors; #already included in asus/flo -enterAndClear "device/lge/g2-common"; -sed -i '3itypeattribute hwaddrs misc_block_device_exception;' sepolicy/hwaddrs.te; - enterAndClear "device/lge/msm8996-common"; sed -i '3itypeattribute hwaddrs misc_block_device_exception;' sepolicy/hwaddrs.te; -enterAndClear "device/moto/shamu"; +#enterAndClear "device/moto/shamu"; #git revert --no-edit 05fb49518049440f90423341ff25d4f75f10bc0c; #restore releasetools #TODO #Make changes to all devices diff --git a/Scripts/LineageOS-16.0/Functions.sh b/Scripts/LineageOS-16.0/Functions.sh index 90e64fdc..b3ec2ad0 100644 --- a/Scripts/LineageOS-16.0/Functions.sh +++ b/Scripts/LineageOS-16.0/Functions.sh @@ -96,11 +96,6 @@ patchWorkspace() { source "$DOS_SCRIPTS_COMMON/Deblob.sh"; source "$DOS_SCRIPTS_COMMON/Patch_CVE.sh"; source build/envsetup.sh; - - #Deblobbing fixes - ##setup-makefiles doesn't execute properly for some devices, running it twice seems to fix whatever is wrong - cd device/google/marlin/marlin && ./setup-makefiles.sh && cd "$DOS_BUILD_BASE"; - cd device/google/marlin/sailfish && ./setup-makefiles.sh && cd "$DOS_BUILD_BASE"; } export -f patchWorkspace; diff --git a/Scripts/LineageOS-16.0/Patch.sh b/Scripts/LineageOS-16.0/Patch.sh index cfe4e35b..32796b97 100644 --- a/Scripts/LineageOS-16.0/Patch.sh +++ b/Scripts/LineageOS-16.0/Patch.sh @@ -239,7 +239,6 @@ git am $DOS_PATCHES/android_device_lge_hammerhead/*.patch; #hh-p-sepolicy rm -rf bdAddrLoader; #duplicate with mako echo "SELINUX_IGNORE_NEVERALLOWS := true" >> BoardConfig.mk; #qcom-legacy sepolicy - enterAndClear "device/oneplus/msm8998-common"; patch -p1 < "$DOS_PATCHES_COMMON/android_device_audio/0001-No_Vorbis_Offload.patch"; #Fix Ogg Vorbis playback awk -i inplace '!/TARGET_RELEASETOOLS_EXTENSIONS/' BoardConfigCommon.mk; #disable releasetools to fix delta ota generation diff --git a/Scripts/init.sh b/Scripts/init.sh index c6ff6541..26d3f5f7 100644 --- a/Scripts/init.sh +++ b/Scripts/init.sh @@ -69,7 +69,6 @@ export DOS_GPS_NTP_SERVER="1.android.pool.ntp.org"; #Options: Any NTP pool export DOS_GPS_SUPL_HOST="supl.google.com"; #Options: supl.{google,vodafone,sonyericsson}.com #Release Processing -export DOS_BUILDALL_SUPERSEDED=false; #Set true to build superseded devices when running buildAll() export DOS_MALWARE_SCAN_BEFORE_SIGN=false; #Scan device files for malware before signing export DOS_GENERATE_DELTAS=true; #Creates deltas from existing target_files in $DOS_BUILDS export DOS_AUTO_ARCHIVE_BUILDS=true; #Copies files to $DOS_BUILDS after signing