From f95b73fe06ed6bcdb4389f4d04c504909c177d3b Mon Sep 17 00:00:00 2001 From: Tad Date: Thu, 12 Jul 2018 22:19:30 -0400 Subject: [PATCH] More overlay work --- Patches/Common/android_vendor_divested/divested.mk | 2 ++ Patches/Common/android_vendor_divested/packages.mk | 8 +------- Scripts/LineageOS-14.1/Patch.sh | 3 ++- Scripts/LineageOS-15.1/Patch.sh | 3 ++- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/Patches/Common/android_vendor_divested/divested.mk b/Patches/Common/android_vendor_divested/divested.mk index 8d997dc3..16fd373b 100644 --- a/Patches/Common/android_vendor_divested/divested.mk +++ b/Patches/Common/android_vendor_divested/divested.mk @@ -25,3 +25,5 @@ endif PRODUCT_COPY_FILES += \ vendor/divested/extras/etc/dns66.json:system/etc/dns66/settings.json + +include vendor/divested/packages.mk diff --git a/Patches/Common/android_vendor_divested/packages.mk b/Patches/Common/android_vendor_divested/packages.mk index 2f5ccfed..42f74837 100644 --- a/Patches/Common/android_vendor_divested/packages.mk +++ b/Patches/Common/android_vendor_divested/packages.mk @@ -18,6 +18,7 @@ PRODUCT_PACKAGES += \ # Replacements PRODUCT_PACKAGES += \ CameraRoll \ + FennecDOS K9Mail \ Silence \ VanillaMusic @@ -26,15 +27,8 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ LocalCalendar -# Browser -# This is a shim, it is intended that F-Droid will update on first run to the real version of Fennec DOS -PRODUCT_PACKAGES += \ - FennecDOS - # Notes # - Official F-Droid will be included once #843 is implemented -# - K-9 Mail will be included after 5.5xx release # - OpenKeychain inclusion is undecided yet # - Net Monitor will be included after #58 is merged # - Orbot/Orfox will most likely never be included due to various reasons -# - Replacing HOSTS with DNS66 isn't ideal as it breaks regular VPN usage diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh index 7e8699f9..8ddc020b 100755 --- a/Scripts/LineageOS-14.1/Patch.sh +++ b/Scripts/LineageOS-14.1/Patch.sh @@ -59,6 +59,7 @@ echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/a #top dir 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 cp -r "$DOS_PREBUILT_APPS""android_vendor_FDroid_PrebuiltApps/." "$DOS_BUILD_BASE""vendor/fdroid_prebuilt/"; #Add the prebuilt apps +cp -r "$DOS_PATCHES_COMMON""android_vendor_divested/." "$DOS_BUILD_BASE""vendor/divested/"; #Add our vendor files enterAndClear "bootable/recovery"; patch -p1 < "$DOS_PATCHES/android_bootable_recovery/0001-Squash_Menus.patch"; #What's a back button? @@ -165,7 +166,7 @@ fi; sed -i 's/CM_BUILDTYPE := UNOFFICIAL/CM_BUILDTYPE := dos/' config/common.mk; #Change buildtype if [ "$DOS_NON_COMMERCIAL_USE_PATCHES" = true ]; then sed -i 's/CM_BUILDTYPE := dos/CM_BUILDTYPE := dosNC/' config/common.mk; fi; cp "$DOS_PATCHES/android_vendor_cm/config.xml" overlay/common/vendor/cmsdk/cm/res/res/values/config.xml; #Per app performance profiles -sed -i '3iinclude vendor/divested/divested.mk' config/common.mk; #Include our customizations +echo 'include vendor/divested/divested.mk' >> config/common.mk; #Include our customizations enterAndClear "vendor/cmsdk"; awk -i inplace '!/WeatherManagerServiceBroker/' cm/res/res/values/config.xml; #Disable Weather diff --git a/Scripts/LineageOS-15.1/Patch.sh b/Scripts/LineageOS-15.1/Patch.sh index 4555ddc2..f3295d74 100755 --- a/Scripts/LineageOS-15.1/Patch.sh +++ b/Scripts/LineageOS-15.1/Patch.sh @@ -59,6 +59,7 @@ echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/a #top dir 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 cp -r "$DOS_PREBUILT_APPS""android_vendor_FDroid_PrebuiltApps/." "$DOS_BUILD_BASE""vendor/fdroid_prebuilt/"; #Add the prebuilt apps +cp -r "$DOS_PATCHES_COMMON""android_vendor_divested/." "$DOS_BUILD_BASE""vendor/divested/"; #Add our vendor files enterAndClear "build/make"; patch -p1 < "$DOS_PATCHES/android_build/0001-Automated_Build_Signing.patch"; #Automated build signing (CopperheadOS-13.0) @@ -162,7 +163,7 @@ awk -i inplace '!/security\/lineage/' config/common.mk; #Remove extra keys if [ "$DOS_DEBLOBBER_REMOVE_AUDIOFX" = true ]; then awk -i inplace '!/AudioFX/' config/common.mk; fi; sed -i 's/LINEAGE_BUILDTYPE := UNOFFICIAL/LINEAGE_BUILDTYPE := dos/' config/common.mk; #Change buildtype if [ "$DOS_NON_COMMERCIAL_USE_PATCHES" = true ]; then sed -i 's/LINEAGE_BUILDTYPE := dos/LINEAGE_BUILDTYPE := dosNC/' config/common.mk; fi; -sed -i '3iinclude vendor/divested/divested.mk' config/common.mk; #Include our customizations +echo 'include vendor/divested/divested.mk' >> config/common.mk; #Include our customizations enterAndClear "vendor/divested"; if [ "$DOS_MICROG_INCLUDED" = "FULL" ]; then echo "PRODUCT_PACKAGES += microG" >> packages.mk;