From 7ccaecd6d6d217402e15f0b2dce2b8c6847cba18 Mon Sep 17 00:00:00 2001 From: Tad Date: Thu, 20 Jan 2022 19:13:08 -0500 Subject: [PATCH] Small tweak Signed-off-by: Tad --- Scripts/Common/Deblob.sh | 4 ++-- Scripts/LineageOS-18.1/Functions.sh | 3 +-- Scripts/LineageOS-18.1/Patch.sh | 11 ----------- 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/Scripts/Common/Deblob.sh b/Scripts/Common/Deblob.sh index cb9fc682..b66efea1 100644 --- a/Scripts/Common/Deblob.sh +++ b/Scripts/Common/Deblob.sh @@ -166,8 +166,8 @@ echo "Deblobbing..."; blobs=$blobs"|if.bin"; #Intel PAVP backend blobs=$blobs"|liblgdrm.so"; #LG #blobs=$blobs"|libtpa_core.so|libdataencrypt_tpa.so|libpkip.so"; #OMAP SMC - blobs=$blobs"|vendor.oneplus.hardware.drmkey.*"; #OnePlus - #blobs=$blobs"|vendor.oneplus.hardware.hdcpkey.*"; #XXX: Breaks radio, linked by libril-qc-hal-qmi.so + blobs=$blobs"|vendor.oneplus.hardware.drmkey.*|bin[/]hw[/]vendor.oneplus.hardware.hdcpkey.*|etc[/]init[/]vendor.oneplus.hardware.hdcpkey.*"; #OnePlus + #blobs=$blobs"|vendor.oneplus.hardware.hdcpkey.*.so"; #XXX: Breaks radio, linked by libril-qc-hal-qmi.so blobs=$blobs"|smc_pa.ift|drmserver.samsung"; #Samsung blobs=$blobs"|provision_device"; #blobs=$blobs"|libasfparser.so|libsavsff.so"; #Parsers diff --git a/Scripts/LineageOS-18.1/Functions.sh b/Scripts/LineageOS-18.1/Functions.sh index 0864daa0..bbb74b38 100644 --- a/Scripts/LineageOS-18.1/Functions.sh +++ b/Scripts/LineageOS-18.1/Functions.sh @@ -139,13 +139,12 @@ patchWorkspace() { touch DOS_PATCHED_FLAG; 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; + #source build/envsetup.sh; #repopick -it eleven-firewall; #repopick -i 314130; #adbconnection: don't spin if adbd isn't running #repopick -i 314453; #TaskViewTouchController: Null check current animation on drag #repopick -i 320663; #Trebuchet: Don't hide home screen rotation setting #repopick -i 321297; #fs_mgr: Don't enable clean_scratch_files on non-dynamic devices - repopick -it R_asb_2022-01; 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 6fd14d17..da54b535 100644 --- a/Scripts/LineageOS-18.1/Patch.sh +++ b/Scripts/LineageOS-18.1/Patch.sh @@ -67,7 +67,6 @@ sed -i '75i$(my_res_package): PRIVATE_AAPT_FLAGS += --auto-add-overlay' core/aap sed -i 's/messaging/Silence/' target/product/aosp_base_telephony.mk target/product/aosp_product.mk; #Replace the Messaging app with Silence awk -i inplace '!/updatable_apex.mk/' target/product/mainline_system.mk; #Disable APEX sed -i 's/PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION := 23/PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION := 28/' core/version_defaults.mk; #Set the minimum supported target SDK to Pie (GrapheneOS) -sed -i 's/2021-12-05/2022-01-05/' core/version_defaults.mk; #Bump Security String #R_asb_2022-01 #XXX fi; if enterAndClear "build/soong"; then @@ -84,16 +83,6 @@ if [ "$(type -t DOS_WEBVIEW_CHERRYPICK)" = "alias" ] ; then DOS_WEBVIEW_CHERRYPI if [ "$DOS_WEBVIEW_LFS" = true ]; then git lfs pull; fi; #Ensure the objects are available fi; -if enterAndClear "external/libexif"; then -git pull https://github.com/LineageOS/android_external_libexif refs/changes/42/321242/1; #R_asb_2022-01 -git pull https://github.com/LineageOS/android_external_libexif refs/changes/43/321243/1; -git pull https://github.com/LineageOS/android_external_libexif refs/changes/44/321244/1; -fi; - -if enterAndClear "external/libavc"; then -git pull https://github.com/LineageOS/android_external_libavc refs/changes/41/321241/1; #R_asb_2022-01 -fi; - if enterAndClear "frameworks/base"; then applyPatch "$DOS_PATCHES/android_frameworks_base/0006-Disable_Analytics.patch"; #Disable/reduce functionality of various ad/analytics libraries applyPatch "$DOS_PATCHES/android_frameworks_base/0007-Always_Restict_Serial.patch"; #Always restrict access to Build.SERIAL (GrapheneOS)