From bfcf6b18b74f88be42f56a0724d7bbc8ede535b4 Mon Sep 17 00:00:00 2001 From: Tad Date: Tue, 11 Jan 2022 06:27:50 -0500 Subject: [PATCH] Fixup Signed-off-by: Tad --- .../0008-Disable_Analytics.patch | 6 +++--- .../0006-Disable_Analytics.patch | 6 +++--- .../0006-Disable_Analytics.patch | 6 +++--- Scripts/LineageOS-14.1/Patch.sh | 10 +++++----- Scripts/LineageOS-15.1/Functions.sh | 3 +-- Scripts/LineageOS-15.1/Patch.sh | 2 +- 6 files changed, 16 insertions(+), 17 deletions(-) diff --git a/Patches/LineageOS-14.1/android_frameworks_base/0008-Disable_Analytics.patch b/Patches/LineageOS-14.1/android_frameworks_base/0008-Disable_Analytics.patch index 83d494fd..da51b02f 100644 --- a/Patches/LineageOS-14.1/android_frameworks_base/0008-Disable_Analytics.patch +++ b/Patches/LineageOS-14.1/android_frameworks_base/0008-Disable_Analytics.patch @@ -6,11 +6,11 @@ Subject: [PATCH] Disable/reduce functionality of various ad/analytics Change-Id: I84303ee26d0232e471f44ae6eff6e41a2210e42e --- - core/java/android/content/pm/PackageParser.java | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) + .../android/content/pm/PackageParser.java | 56 +++++++++++++++++++ + 1 file changed, 56 insertions(+) diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java -index f2e3333b67da..f8bfc011e670 100644 +index f2e3333b67da..35073ed38d3a 100644 --- a/core/java/android/content/pm/PackageParser.java +++ b/core/java/android/content/pm/PackageParser.java @@ -4465,6 +4465,62 @@ public class PackageParser { diff --git a/Patches/LineageOS-15.1/android_frameworks_base/0006-Disable_Analytics.patch b/Patches/LineageOS-15.1/android_frameworks_base/0006-Disable_Analytics.patch index 5a3d4cf0..74b251a5 100644 --- a/Patches/LineageOS-15.1/android_frameworks_base/0006-Disable_Analytics.patch +++ b/Patches/LineageOS-15.1/android_frameworks_base/0006-Disable_Analytics.patch @@ -6,11 +6,11 @@ Subject: [PATCH] Disable/reduce functionality of various ad/analytics Change-Id: I84303ee26d0232e471f44ae6eff6e41a2210e42e --- - core/java/android/content/pm/PackageParser.java | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) + .../android/content/pm/PackageParser.java | 56 +++++++++++++++++++ + 1 file changed, 56 insertions(+) diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java -index 8c66fb227cf9..a5c783597b34 100644 +index 8c66fb227cf9..4421c0ca5115 100644 --- a/core/java/android/content/pm/PackageParser.java +++ b/core/java/android/content/pm/PackageParser.java @@ -5524,6 +5524,62 @@ public class PackageParser { diff --git a/Patches/LineageOS-16.0/android_frameworks_base/0006-Disable_Analytics.patch b/Patches/LineageOS-16.0/android_frameworks_base/0006-Disable_Analytics.patch index e28162d2..99536495 100644 --- a/Patches/LineageOS-16.0/android_frameworks_base/0006-Disable_Analytics.patch +++ b/Patches/LineageOS-16.0/android_frameworks_base/0006-Disable_Analytics.patch @@ -6,11 +6,11 @@ Subject: [PATCH] Disable/reduce functionality of various ad/analytics Change-Id: I84303ee26d0232e471f44ae6eff6e41a2210e42e --- - core/java/android/content/pm/PackageParser.java | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) + .../android/content/pm/PackageParser.java | 56 +++++++++++++++++++ + 1 file changed, 56 insertions(+) diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java -index e0c2d2dc6dde..85a669a4a6c1 100644 +index e0c2d2dc6dde..405291d46f58 100644 --- a/core/java/android/content/pm/PackageParser.java +++ b/core/java/android/content/pm/PackageParser.java @@ -5327,6 +5327,62 @@ public class PackageParser { diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh index 64d41e0f..51e113f5 100644 --- a/Scripts/LineageOS-14.1/Patch.sh +++ b/Scripts/LineageOS-14.1/Patch.sh @@ -426,11 +426,11 @@ enableLowRam "device/samsung/tuna"; #Fixes #Fix broken options enabled by hardenDefconfig() -sed -i "s/# CONFIG_KPROBES is not set/CONFIG_KPROBES=y/" kernel/amazon/hdx-common/arch/arm/configs/*hdx*_defconfig; #Breaks on compile -sed -i "s/CONFIG_X509_CERTIFICATE_PARSER=y/# CONFIG_X509_CERTIFICATE_PARSER is not set/" kernel/amazon/hdx-common/arch/arm/configs/*hdx*_defconfig; #Breaks on compile -sed -i "s/ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y/# ASYMMETRIC_PUBLIC_KEY_SUBTYPE is not set/" kernel/amazon/hdx-common/arch/arm/configs/*hdx*_defconfig; #Breaks on compile -sed -i "s/SYSTEM_TRUSTED_KEYRING=y/# SYSTEM_TRUSTED_KEYRING is not set/" kernel/amazon/hdx-common/arch/arm/configs/*hdx*_defconfig; #Breaks on compile -sed -i "s/ASYMMETRIC_KEY_TYPE=y/# ASYMMETRIC_KEY_TYPE is not set/" kernel/amazon/hdx-common/arch/arm/configs/*hdx*_defconfig; #Breaks on compile +sed -i "s/# CONFIG_KPROBES is not set/CONFIG_KPROBES=y/" kernel/amazon/hdx-common/arch/arm/configs/*defconfig; #Breaks on compile +sed -i "s/CONFIG_X509_CERTIFICATE_PARSER=y/# CONFIG_X509_CERTIFICATE_PARSER is not set/" kernel/amazon/hdx-common/arch/arm/configs/*defconfig; #Breaks on compile +sed -i "s/CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y/# CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE is not set/" kernel/amazon/hdx-common/arch/arm/configs/*defconfig; #Breaks on compile +sed -i "s/CONFIG_SYSTEM_TRUSTED_KEYRING=y/# CONFIG_SYSTEM_TRUSTED_KEYRING is not set/" kernel/amazon/hdx-common/arch/arm/configs/*defconfig; #Breaks on compile +sed -i "s/CONFIG_ASYMMETRIC_KEY_TYPE=y/# CONFIG_ASYMMETRIC_KEY_TYPE is not set/" kernel/amazon/hdx-common/arch/arm/configs/*defconfig; #Breaks on compile sed -i "s/CONFIG_DEBUG_RODATA=y/# CONFIG_DEBUG_RODATA is not set/" kernel/asus/grouper/arch/arm/configs/grouper_defconfig; #Breaks on compile awk -i inplace '!/STACKPROTECTOR/' kernel/lge/msm8992/arch/arm64/configs/lineageos_*_defconfig; #Breaks on compile sed -i "s/CONFIG_ARM_SMMU=y/# CONFIG_ARM_SMMU is not set/" kernel/motorola/msm8992/arch/arm64/configs/*defconfig; #Breaks on compile diff --git a/Scripts/LineageOS-15.1/Functions.sh b/Scripts/LineageOS-15.1/Functions.sh index ac9f95ce..e1fe9fb4 100644 --- a/Scripts/LineageOS-15.1/Functions.sh +++ b/Scripts/LineageOS-15.1/Functions.sh @@ -88,8 +88,7 @@ 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; - repopick -it O_asb_2021-12; + #source build/envsetup.sh; sh "$DOS_SCRIPTS/Patch.sh"; sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh"; diff --git a/Scripts/LineageOS-15.1/Patch.sh b/Scripts/LineageOS-15.1/Patch.sh index a539843a..2d9618ed 100644 --- a/Scripts/LineageOS-15.1/Patch.sh +++ b/Scripts/LineageOS-15.1/Patch.sh @@ -72,7 +72,7 @@ applyPatch "$DOS_PATCHES/android_build/0001-OTA_Keys.patch"; #Add correct keys t applyPatch "$DOS_PATCHES/android_build/0002-Enable_fwrapv.patch"; #Use -fwrapv at a minimum (GrapheneOS) sed -i '57i$(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/messaging/Silence/' target/product/aosp_base_telephony.mk target/product/treble_common.mk; #Replace the Messaging app with Silence -sed -i 's/2021-10-05/2021-12-05/' core/version_defaults.mk; #Bump Security String #O_asb_2021-11 #XXX +sed -i 's/2021-10-05/2021-12-05/' core/version_defaults.mk; #Bump Security String #O_asb_2021-12 #XXX fi; if enterAndClear "build/soong"; then