From 7af3c423258a6556b45e4c6970b323dcf1e6ce1f Mon Sep 17 00:00:00 2001 From: Tad Date: Sat, 23 May 2020 23:31:05 -0400 Subject: [PATCH] Minor fixes --- .../0001-Fixup_a7e400ce.patch | 35 +++++++++++++++++++ Scripts/LineageOS-15.1/Patch.sh | 2 -- Scripts/LineageOS-16.0/Patch.sh | 2 -- Scripts/LineageOS-17.1/Patch.sh | 3 +- 4 files changed, 36 insertions(+), 6 deletions(-) create mode 100644 Patches/LineageOS-17.1/android_vendor_lineage/0001-Fixup_a7e400ce.patch diff --git a/Patches/LineageOS-17.1/android_vendor_lineage/0001-Fixup_a7e400ce.patch b/Patches/LineageOS-17.1/android_vendor_lineage/0001-Fixup_a7e400ce.patch new file mode 100644 index 00000000..ee87c17f --- /dev/null +++ b/Patches/LineageOS-17.1/android_vendor_lineage/0001-Fixup_a7e400ce.patch @@ -0,0 +1,35 @@ +From 339b9777bf562e9ec10d128c93f31d6d0c1e4a10 Mon Sep 17 00:00:00 2001 +From: Tad +Date: Sat, 23 May 2020 21:35:12 -0400 +Subject: [PATCH] Fixup a7e400ce + +Change-Id: I4fcf0b2524c8aaf947fa378638ae9bc73dc451be +--- + build/tools/extract_utils.sh | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/build/tools/extract_utils.sh b/build/tools/extract_utils.sh +index 7b6e9cc2..657bacb9 100644 +--- a/build/tools/extract_utils.sh ++++ b/build/tools/extract_utils.sh +@@ -456,11 +456,16 @@ function write_blueprint_packages() { + printf '\t\tenabled: false,\n' + printf '\t},\n' + fi +- if [ "$CLASS" = "SHARED_LIBRARIES" ] || [ "$CLASS" = "EXECUTABLES" ] || [ "$CLASS" = "ETC" ] ; then ++ if [ "$CLASS" = "SHARED_LIBRARIES" ] || [ "$CLASS" = "EXECUTABLES" ] ; then + if [ "$DIRNAME" != "." ]; then + printf '\trelative_install_path: "%s",\n' "$DIRNAME" + fi + fi ++ if [ "$CLASS" = "ETC" ] ; then ++ if [ "$DIRNAME" != "." ]; then ++ printf '\tsub_dir: "%s",\n' "$DIRNAME" ++ fi ++ fi + if [ "$CLASS" = "SHARED_LIBRARIES" ] || [ "$CLASS" = "EXECUTABLES" ] ; then + printf '\tprefer: true,\n' + fi +-- +2.26.2 + diff --git a/Scripts/LineageOS-15.1/Patch.sh b/Scripts/LineageOS-15.1/Patch.sh index 6d226ac6..88f23f8a 100644 --- a/Scripts/LineageOS-15.1/Patch.sh +++ b/Scripts/LineageOS-15.1/Patch.sh @@ -51,7 +51,6 @@ echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/a # #top dir -cp -r "$DOS_PREBUILT_APPS""Backup" "$DOS_BUILD_BASE""packages/apps/"; cp -r "$DOS_PREBUILT_APPS""Fennec_DOS-Shim" "$DOS_BUILD_BASE""packages/apps/"; #Add a shim to install Fennec DOS without actually including the large APK gpgVerifyDirectory "$DOS_PREBUILT_APPS""android_vendor_FDroid_PrebuiltApps/packages"; cp -r "$DOS_PREBUILT_APPS""android_vendor_FDroid_PrebuiltApps/." "$DOS_BUILD_BASE""vendor/fdroid_prebuilt/"; #Add the prebuilt apps @@ -193,7 +192,6 @@ if [ "$DOS_NON_COMMERCIAL_USE_PATCHES" = true ]; then sed -i 's/LINEAGE_BUILDTYP echo 'include vendor/divested/divestos.mk' >> config/common.mk; #Include our customizations enter "vendor/divested"; -#echo "PRODUCT_PACKAGES += Backup" >> packages.mk; if [ "$DOS_MICROG_INCLUDED" = "FULL" ]; then echo "PRODUCT_PACKAGES += GmsCore GsfProxy FakeStore" >> packages.mk; fi; if [ "$DOS_HOSTS_BLOCKING" = false ]; then echo "PRODUCT_PACKAGES += $DOS_HOSTS_BLOCKING_APP" >> packages.mk; fi; # diff --git a/Scripts/LineageOS-16.0/Patch.sh b/Scripts/LineageOS-16.0/Patch.sh index 04abb786..0737c013 100644 --- a/Scripts/LineageOS-16.0/Patch.sh +++ b/Scripts/LineageOS-16.0/Patch.sh @@ -51,7 +51,6 @@ echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/a # #top dir -cp -r "$DOS_PREBUILT_APPS""Backup" "$DOS_BUILD_BASE""packages/apps/"; cp -r "$DOS_PREBUILT_APPS""Fennec_DOS-Shim" "$DOS_BUILD_BASE""packages/apps/"; #Add a shim to install Fennec DOS without actually including the large APK gpgVerifyDirectory "$DOS_PREBUILT_APPS""android_vendor_FDroid_PrebuiltApps/packages"; cp -r "$DOS_PREBUILT_APPS""android_vendor_FDroid_PrebuiltApps/." "$DOS_BUILD_BASE""vendor/fdroid_prebuilt/"; #Add the prebuilt apps @@ -190,7 +189,6 @@ if [ "$DOS_NON_COMMERCIAL_USE_PATCHES" = true ]; then sed -i 's/LINEAGE_BUILDTYP echo 'include vendor/divested/divestos.mk' >> config/common.mk; #Include our customizations enter "vendor/divested"; -#echo "PRODUCT_PACKAGES += Backup" >> packages.mk; if [ "$DOS_MICROG_INCLUDED" = "FULL" ]; then echo "PRODUCT_PACKAGES += GmsCore GsfProxy FakeStore" >> packages.mk; fi; if [ "$DOS_HOSTS_BLOCKING" = false ]; then echo "PRODUCT_PACKAGES += $DOS_HOSTS_BLOCKING_APP" >> packages.mk; fi; echo "PRODUCT_PACKAGES += vendor.lineage.trust@1.0-service" >> packages.mk; #All of our kernels have deny USB patch added diff --git a/Scripts/LineageOS-17.1/Patch.sh b/Scripts/LineageOS-17.1/Patch.sh index 39b8558b..4a804d1d 100644 --- a/Scripts/LineageOS-17.1/Patch.sh +++ b/Scripts/LineageOS-17.1/Patch.sh @@ -51,7 +51,6 @@ echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/a # #top dir -cp -r "$DOS_PREBUILT_APPS""Backup" "$DOS_BUILD_BASE""packages/apps/"; cp -r "$DOS_PREBUILT_APPS""Fennec_DOS-Shim" "$DOS_BUILD_BASE""packages/apps/"; #Add a shim to install Fennec DOS without actually including the large APK gpgVerifyDirectory "$DOS_PREBUILT_APPS""android_vendor_FDroid_PrebuiltApps/packages"; cp -r "$DOS_PREBUILT_APPS""android_vendor_FDroid_PrebuiltApps/." "$DOS_BUILD_BASE""vendor/fdroid_prebuilt/"; #Add the prebuilt apps @@ -172,6 +171,7 @@ patch -p1 < "$DOS_PATCHES/android_system_sepolicy/0001-LGE_Fixes.patch" --direct awk -i inplace '!/true cannot be used in user builds/' Android.mk; #Allow ignoring neverallows under -user enterAndClear "vendor/lineage"; +patch -p1 < "$DOS_PATCHES/android_vendor_lineage/0001-Fixup_a7e400ce.patch"; rm build/target/product/security/lineage.x509.pem; rm -rf overlay/common/lineage-sdk/packages/LineageSettingsProvider/res/values/defaults.xml; #Remove analytics rm -rf verity_tool; #Resurrect dm-verity @@ -188,7 +188,6 @@ if [ "$DOS_NON_COMMERCIAL_USE_PATCHES" = true ]; then sed -i 's/LINEAGE_BUILDTYP echo 'include vendor/divested/divestos.mk' >> config/common.mk; #Include our customizations enter "vendor/divested"; -#echo "PRODUCT_PACKAGES += Backup" >> packages.mk; if [ "$DOS_MICROG_INCLUDED" = "FULL" ]; then echo "PRODUCT_PACKAGES += GmsCore GsfProxy FakeStore" >> packages.mk; fi; if [ "$DOS_HOSTS_BLOCKING" = false ]; then echo "PRODUCT_PACKAGES += $DOS_HOSTS_BLOCKING_APP" >> packages.mk; fi; echo "PRODUCT_PACKAGES += vendor.lineage.trust@1.0-service" >> packages.mk; #All of our kernels have deny USB patch added