From 472ec96915eadd578d117ab404a9d2fb588bdb29 Mon Sep 17 00:00:00 2001 From: Tad Date: Wed, 22 Mar 2023 16:23:26 -0400 Subject: [PATCH] Churn Signed-off-by: Tad --- Scripts/Common/Deblob.sh | 2 +- Scripts/LineageOS-16.0/Functions.sh | 1 + Scripts/LineageOS-16.0/Patch.sh | 2 +- Scripts/LineageOS-18.1/Functions.sh | 3 +-- Scripts/LineageOS-18.1/Patch.sh | 4 ---- Scripts/LineageOS-19.1/Functions.sh | 1 - Scripts/LineageOS-19.1/Patch.sh | 4 ---- Scripts/LineageOS-20.0/Functions.sh | 14 +++++++------- Scripts/LineageOS-20.0/Patch.sh | 1 + 9 files changed, 12 insertions(+), 20 deletions(-) diff --git a/Scripts/Common/Deblob.sh b/Scripts/Common/Deblob.sh index 5b48e3cf..c03adbbc 100644 --- a/Scripts/Common/Deblob.sh +++ b/Scripts/Common/Deblob.sh @@ -276,7 +276,7 @@ echo "Deblobbing..."; blobs=$blobs"|SCONE.apk"; #??? blobs=$blobs"|DevicePersonalizationPrebuilt.*.apk|DeviceIntelligence.*.apk"; blobs=$blobs"|libhwinfo.jar|com.google.android.hardwareinfo.xml"; - overlay=$overlay"|config_defaultAttentionService|config_defaultSystemCaptionsManagerService|config_defaultSystemCaptionsService|config_systemAmbientAudioIntelligence|config_systemAudioIntelligence|config_systemNotificationIntelligence|config_systemTextIntelligence|config_systemUiIntelligence|config_systemVisualIntelligence|config_defaultContentSuggestionsService"; + overlay=$overlay"|config_defaultAttentionService|config_defaultSystemCaptionsManagerService|config_defaultSystemCaptionsService|config_systemAmbientAudioIntelligence|config_systemAudioIntelligence|config_systemNotificationIntelligence|config_systemTextIntelligence|config_systemUiIntelligence|config_systemVisualIntelligence|config_defaultContentSuggestionsService|config_defaultAppPredictionService"; overlay=$overlay"|config_defaultWellbeingPackage|config_defaultSupervisionProfileOwnerComponent"; overlay=$overlay"|platform_carrier_config_package"; diff --git a/Scripts/LineageOS-16.0/Functions.sh b/Scripts/LineageOS-16.0/Functions.sh index fd7e6f50..cf3eccfa 100644 --- a/Scripts/LineageOS-16.0/Functions.sh +++ b/Scripts/LineageOS-16.0/Functions.sh @@ -92,6 +92,7 @@ patchWorkspace() { repopick -it P_asb_2022-12 -e 345931; repopick -it P_asb_2023-01 -e 347129; repopick -it P_asb_2023-02 -e 349337; + repopick -it P_asb_2023-03; sh "$DOS_SCRIPTS/Patch.sh"; sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh"; diff --git a/Scripts/LineageOS-16.0/Patch.sh b/Scripts/LineageOS-16.0/Patch.sh index 4f79c17c..15c5176c 100644 --- a/Scripts/LineageOS-16.0/Patch.sh +++ b/Scripts/LineageOS-16.0/Patch.sh @@ -97,7 +97,7 @@ applyPatch "$DOS_PATCHES/android_build/0002-Enable_fwrapv.patch"; #Use -fwrapv a sed -i '74i$(my_res_package): PRIVATE_AAPT_FLAGS += --auto-add-overlay' core/aapt2.mk; #Enable auto-add-overlay for packages, this allows the vendor overlay to easily work across all branches. sed -i 's/PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION := 17/PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION := 28/' core/version_defaults.mk; #Set the minimum supported target SDK to Pie (GrapheneOS) awk -i inplace '!/Email/' target/product/core.mk; #Remove Email -sed -i 's/2022-01-05/2023-02-05/' core/version_defaults.mk; #Bump Security String #P_asb_2023-02 #XXX +sed -i 's/2022-01-05/2023-03-05/' core/version_defaults.mk; #Bump Security String #P_asb_2023-03 #XXX fi; if enterAndClear "build/soong"; then diff --git a/Scripts/LineageOS-18.1/Functions.sh b/Scripts/LineageOS-18.1/Functions.sh index 19680928..2c5dc518 100644 --- a/Scripts/LineageOS-18.1/Functions.sh +++ b/Scripts/LineageOS-18.1/Functions.sh @@ -113,11 +113,10 @@ patchWorkspace() { verifyAllPlatformTags; gpgVerifyGitHead "$DOS_BUILD_BASE/external/chromium-webview"; - source build/envsetup.sh; + #source build/envsetup.sh; #repopick -it eleven-firewall; #repopick -i 314453; #TaskViewTouchController: Null check current animation on drag #repopick -i 325011; #lineage: Opt-in to shipping full recovery image by default - repopick -it R_asb_2023-03; sh "$DOS_SCRIPTS/Patch.sh"; sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh"; diff --git a/Scripts/LineageOS-18.1/Patch.sh b/Scripts/LineageOS-18.1/Patch.sh index b72f7bad..b17cfdb5 100644 --- a/Scripts/LineageOS-18.1/Patch.sh +++ b/Scripts/LineageOS-18.1/Patch.sh @@ -122,10 +122,6 @@ applyPatch "$DOS_PATCHES/android_external_hardened_malloc/0001-Broken_Cameras.pa fi; fi; -if enterAndClear "external/zlib"; then -git fetch https://github.com/LineageOS/android_external_zlib refs/changes/09/351409/1 && git cherry-pick FETCH_HEAD; #R_asb_2023-03 -fi; - if enterAndClear "frameworks/base"; then applyPatch "$DOS_PATCHES/android_frameworks_base/0007-Always_Restict_Serial.patch"; #Always restrict access to Build.SERIAL (GrapheneOS) applyPatch "$DOS_PATCHES/android_frameworks_base/0008-Browser_No_Location.patch"; #Don't grant location permission to system browsers (GrapheneOS) diff --git a/Scripts/LineageOS-19.1/Functions.sh b/Scripts/LineageOS-19.1/Functions.sh index d01a14f2..e7b9a3b4 100644 --- a/Scripts/LineageOS-19.1/Functions.sh +++ b/Scripts/LineageOS-19.1/Functions.sh @@ -82,7 +82,6 @@ patchWorkspace() { #repopick -ift twelve-bt-sbc-hd-dualchannel; #repopick -it twelve-colors; repopick -if 330099; #Updater: Add prop for allowing major updates - repopick -it S_asb_2023-03; sh "$DOS_SCRIPTS/Patch.sh"; sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh"; diff --git a/Scripts/LineageOS-19.1/Patch.sh b/Scripts/LineageOS-19.1/Patch.sh index 943db8c0..b49b4420 100644 --- a/Scripts/LineageOS-19.1/Patch.sh +++ b/Scripts/LineageOS-19.1/Patch.sh @@ -125,10 +125,6 @@ sed -i '/LOCAL_MODULE/s/Camera/SecureCamera/' Android.mk; #Change module name sed -i '11iLOCAL_OVERRIDES_PACKAGES := Camera Camera2 LegacyCamera Snap OpenCamera' Android.mk; #Replace the others fi; -if enterAndClear "external/zlib"; then -git fetch https://github.com/LineageOS/android_external_zlib refs/changes/79/351379/1 && git cherry-pick FETCH_HEAD; #S_asb_2023-03 -fi; - if enterAndClear "frameworks/base"; then applyPatch "$DOS_PATCHES/android_frameworks_base/344888-backport.patch"; #fixup! fw/b: Add support for allowing/disallowing apps on cellular, vpn and wifi networks (CalyxOS) applyPatch "$DOS_PATCHES/android_frameworks_base/0007-Always_Restict_Serial.patch"; #Always restrict access to Build.SERIAL (GrapheneOS) diff --git a/Scripts/LineageOS-20.0/Functions.sh b/Scripts/LineageOS-20.0/Functions.sh index 04b1cc3c..dcec34b4 100644 --- a/Scripts/LineageOS-20.0/Functions.sh +++ b/Scripts/LineageOS-20.0/Functions.sh @@ -53,10 +53,10 @@ buildAll() { cd "$DOS_BUILD_BASE"; if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanWorkspaceForMalware; fi; #frontloaded for testing - buildDevice bluejay avb; #unb + buildDevice bluejay avb; #SD835 - buildDevice taimen avb; #unb - buildDevice walleye avb; #unb + buildDevice taimen avb; + buildDevice walleye avb; buildDevice cheeseburger verity; buildDevice dumpling verity; buildDevice mata verity; #unb @@ -100,10 +100,10 @@ buildAll() { buildDevice bonito avb; #unb buildDevice sargo avb; #unb #Tensor - buildDevice oriole avb; #unb - buildDevice raven avb; #unb - buildDevice panther avb; #unb - buildDevice cheetah avb; #unb + buildDevice oriole avb; + buildDevice raven avb; + buildDevice panther avb; + buildDevice cheetah avb; } export -f buildAll; diff --git a/Scripts/LineageOS-20.0/Patch.sh b/Scripts/LineageOS-20.0/Patch.sh index 9d119871..a5a66a44 100644 --- a/Scripts/LineageOS-20.0/Patch.sh +++ b/Scripts/LineageOS-20.0/Patch.sh @@ -434,6 +434,7 @@ fi; if enterAndClear "device/google/gs201"; then if [ "$DOS_DEBLOBBER_REMOVE_CNE" = true ]; then sed -i '/google iwlan/,+8d' device.mk; fi; #fix stray +if [ "$DOS_DEBLOBBER_REMOVE_EUICC" = true ]; then sed -i '/eSIM MEP/,+4d' device.mk; fi; #fix stray awk -i inplace '!/PRODUCT_PACKAGES/' widevine/device.mk; fi;