diff --git a/.gitmodules b/.gitmodules index 968eb93e..c25929c8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,3 +7,6 @@ [submodule "Patches/Android"] path = Patches/Android url = ssh://git@10.0.1.5:2222/DivestOS/Android_Patches.git +[submodule "PrebuiltApps"] + path = PrebuiltApps + url = ssh://git@10.0.1.5:2222/DivestOS/PrebuiltApps.git diff --git a/Manifests/Manifest_LAOS-14.1.xml b/Manifests/Manifest_LAOS-14.1.xml index bb1670a2..d9b27bb4 100644 --- a/Manifests/Manifest_LAOS-14.1.xml +++ b/Manifests/Manifest_LAOS-14.1.xml @@ -91,18 +91,10 @@ - - - - - - - - diff --git a/Manifests/Manifest_LAOS-15.1.xml b/Manifests/Manifest_LAOS-15.1.xml index 40523dea..6f70f644 100644 --- a/Manifests/Manifest_LAOS-15.1.xml +++ b/Manifests/Manifest_LAOS-15.1.xml @@ -76,18 +76,10 @@ - - - - - - - - diff --git a/Patches/LineageOS-14.1/android_packages_apps_DejaVu/Android.mk b/Patches/LineageOS-14.1/android_packages_apps_DejaVu/Android.mk deleted file mode 100644 index 41bb6ea5..00000000 --- a/Patches/LineageOS-14.1/android_packages_apps_DejaVu/Android.mk +++ /dev/null @@ -1,28 +0,0 @@ -#Created from F-Droid's Android.mk - -LOCAL_PATH:= $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := DejaVu -LOCAL_MODULE_TAGS := optional -LOCAL_PACKAGE_NAME := DejaVu - -dejavu_root := $(LOCAL_PATH) -dejavu_out := $(PWD)/$(OUT_DIR)/target/common/obj/APPS/$(LOCAL_MODULE)_intermediates -dejavu_build := $(dejavu_root)/build -dejavu_apk := app/build/outputs/apk/release/app-release-unsigned.apk - -$(dejavu_root)/$(dejavu_apk): - rm -Rf $(dejavu_build) - mkdir -p $(dejavu_out) - ln -sf $(dejavu_out) $(dejavu_build) - cd $(dejavu_root) && gradle assembleRelease - -LOCAL_CERTIFICATE := platform -LOCAL_DEX_PREOPT := false -LOCAL_SRC_FILES := $(dejavu_apk) -LOCAL_MODULE_CLASS := APPS -LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX) - -include $(BUILD_PREBUILT) diff --git a/Patches/LineageOS-14.1/android_packages_apps_Silence/Android.mk b/Patches/LineageOS-14.1/android_packages_apps_Silence/Android.mk deleted file mode 100644 index c0b4812e..00000000 --- a/Patches/LineageOS-14.1/android_packages_apps_Silence/Android.mk +++ /dev/null @@ -1,30 +0,0 @@ -#Created from F-Droid's Android.mk - -LOCAL_PATH:= $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := Silence -LOCAL_MODULE_TAGS := optional -LOCAL_PACKAGE_NAME := Silence - -silence_root := $(LOCAL_PATH) -silence_out := $(PWD)/$(OUT_DIR)/target/common/obj/APPS/$(LOCAL_MODULE)_intermediates -silence_build := $(silence_root)/build -silence_apk := build/outputs/apk/Silence-release-unsigned.apk - -$(silence_root)/$(silence_apk): - rm -Rf $(silence_build) - mkdir -p $(silence_out) - ln -sf $(silence_out) $(silence_build) - cd $(silence_root) && git submodule update --recursive --init - cd $(silence_root) && gradle assembleRelease - -LOCAL_CERTIFICATE := platform -LOCAL_OVERRIDES_PACKAGES := messaging -LOCAL_DEX_PREOPT := false -LOCAL_SRC_FILES := $(silence_apk) -LOCAL_MODULE_CLASS := APPS -LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX) - -include $(BUILD_PREBUILT) diff --git a/Patches/LineageOS-14.1/android_vendor_cm/sce.mk b/Patches/LineageOS-14.1/android_vendor_cm/sce.mk index a0240e73..486730a1 100644 --- a/Patches/LineageOS-14.1/android_vendor_cm/sce.mk +++ b/Patches/LineageOS-14.1/android_vendor_cm/sce.mk @@ -6,7 +6,7 @@ PRODUCT_PACKAGES += \ # UnifiedNLP Backends PRODUCT_PACKAGES += \ - DejaVu \ + DejaVuNlpBackend \ IchnaeaNlpBackend \ NominatimNlpBackend @@ -15,6 +15,10 @@ PRODUCT_PACKAGES += \ F-Droid \ FDroidPrivilegedExtension +# Others +PRODUCT_PACKAGES += \ + LocalCalendar + # Browser # XXX: THIS DOESN'T WORK # This is a shim, it is intended that F-Droid will update on first run to the real version of Fennec DOS diff --git a/Patches/LineageOS-15.1/android_packages_apps_DejaVu/Android.mk b/Patches/LineageOS-15.1/android_packages_apps_DejaVu/Android.mk deleted file mode 100644 index 41bb6ea5..00000000 --- a/Patches/LineageOS-15.1/android_packages_apps_DejaVu/Android.mk +++ /dev/null @@ -1,28 +0,0 @@ -#Created from F-Droid's Android.mk - -LOCAL_PATH:= $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := DejaVu -LOCAL_MODULE_TAGS := optional -LOCAL_PACKAGE_NAME := DejaVu - -dejavu_root := $(LOCAL_PATH) -dejavu_out := $(PWD)/$(OUT_DIR)/target/common/obj/APPS/$(LOCAL_MODULE)_intermediates -dejavu_build := $(dejavu_root)/build -dejavu_apk := app/build/outputs/apk/release/app-release-unsigned.apk - -$(dejavu_root)/$(dejavu_apk): - rm -Rf $(dejavu_build) - mkdir -p $(dejavu_out) - ln -sf $(dejavu_out) $(dejavu_build) - cd $(dejavu_root) && gradle assembleRelease - -LOCAL_CERTIFICATE := platform -LOCAL_DEX_PREOPT := false -LOCAL_SRC_FILES := $(dejavu_apk) -LOCAL_MODULE_CLASS := APPS -LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX) - -include $(BUILD_PREBUILT) diff --git a/Patches/LineageOS-15.1/android_packages_apps_Silence/Android.mk b/Patches/LineageOS-15.1/android_packages_apps_Silence/Android.mk deleted file mode 100644 index c0b4812e..00000000 --- a/Patches/LineageOS-15.1/android_packages_apps_Silence/Android.mk +++ /dev/null @@ -1,30 +0,0 @@ -#Created from F-Droid's Android.mk - -LOCAL_PATH:= $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := Silence -LOCAL_MODULE_TAGS := optional -LOCAL_PACKAGE_NAME := Silence - -silence_root := $(LOCAL_PATH) -silence_out := $(PWD)/$(OUT_DIR)/target/common/obj/APPS/$(LOCAL_MODULE)_intermediates -silence_build := $(silence_root)/build -silence_apk := build/outputs/apk/Silence-release-unsigned.apk - -$(silence_root)/$(silence_apk): - rm -Rf $(silence_build) - mkdir -p $(silence_out) - ln -sf $(silence_out) $(silence_build) - cd $(silence_root) && git submodule update --recursive --init - cd $(silence_root) && gradle assembleRelease - -LOCAL_CERTIFICATE := platform -LOCAL_OVERRIDES_PACKAGES := messaging -LOCAL_DEX_PREOPT := false -LOCAL_SRC_FILES := $(silence_apk) -LOCAL_MODULE_CLASS := APPS -LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX) - -include $(BUILD_PREBUILT) diff --git a/Patches/LineageOS-15.1/android_vendor_lineage/sce.mk b/Patches/LineageOS-15.1/android_vendor_lineage/sce.mk index a0240e73..486730a1 100644 --- a/Patches/LineageOS-15.1/android_vendor_lineage/sce.mk +++ b/Patches/LineageOS-15.1/android_vendor_lineage/sce.mk @@ -6,7 +6,7 @@ PRODUCT_PACKAGES += \ # UnifiedNLP Backends PRODUCT_PACKAGES += \ - DejaVu \ + DejaVuNlpBackend \ IchnaeaNlpBackend \ NominatimNlpBackend @@ -15,6 +15,10 @@ PRODUCT_PACKAGES += \ F-Droid \ FDroidPrivilegedExtension +# Others +PRODUCT_PACKAGES += \ + LocalCalendar + # Browser # XXX: THIS DOESN'T WORK # This is a shim, it is intended that F-Droid will update on first run to the real version of Fennec DOS diff --git a/PrebuiltApps b/PrebuiltApps new file mode 160000 index 00000000..df494cf7 --- /dev/null +++ b/PrebuiltApps @@ -0,0 +1 @@ +Subproject commit df494cf7ca300cf448ce26c0f3eb33799f5dd913 diff --git a/Scripts/LineageOS-14.1/00init.sh b/Scripts/LineageOS-14.1/00init.sh index a9f57db7..8d65f673 100644 --- a/Scripts/LineageOS-14.1/00init.sh +++ b/Scripts/LineageOS-14.1/00init.sh @@ -23,6 +23,7 @@ export base=$androidWorkspace"Build/LineageOS-14.1/"; export SIGNING_KEY_DIR=$androidWorkspace"Signing_Keys"; export OTA_PACKAGE_SIGNING_KEY=$SIGNING_KEY_DIR"/releasekey" +export prebuiltApps=$androidWorkspace"PrebuiltApps/"; export patches=$androidWorkspace"Patches/LineageOS-14.1/"; export cvePatchesLinux=$androidWorkspace"Patches/Linux/"; export cvePatchesAndroid=$androidWorkspace"Patches/Android/"; diff --git a/Scripts/LineageOS-14.1/Functions.sh b/Scripts/LineageOS-14.1/Functions.sh index 1cc04900..0b708ad1 100644 --- a/Scripts/LineageOS-14.1/Functions.sh +++ b/Scripts/LineageOS-14.1/Functions.sh @@ -46,7 +46,7 @@ gitReset() { export -f gitReset; resetWorkspace() { - repo forall -c 'git add -A && git reset --hard' && rm -rf packages/apps/{FDroid,GmsCore,Silence} out && repo sync -j20 --force-sync; + repo forall -c 'git add -A && git reset --hard' && rm -rf packages/apps/{FDroid,GmsCore} out && repo sync -j20 --force-sync; } export -f resetWorkspace; diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh index 7e09eeed..8bb2ca26 100755 --- a/Scripts/LineageOS-14.1/Patch.sh +++ b/Scripts/LineageOS-14.1/Patch.sh @@ -58,6 +58,7 @@ echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/a #top dir cp -r $patches"Fennec_DOS-Shim" $base"packages/apps/"; #Add a shim to install Fennec DOS without actually including the large APK +cp -r $prebuiltApps"android_vendor_FDroid_PrebuiltApps" $base"vendor/fdroid_prebuilt"; #Add the prebuilt apps enterAndClear "bootable/recovery" patch -p1 < $patches"android_bootable_recovery/0001-Squash_Menus.patch"; #What's a back button? @@ -103,9 +104,6 @@ sed -i 's|config_showWeatherMenu">true|config_showWeatherMenu">false|' res/value patch -p1 < $patches"android_packages_apps_CMParts/0001-Remove_Analytics.patch" #Remove the rest of CMStats patch -p1 < $patches"android_packages_apps_CMParts/0002-Reduced_Resolution.patch" #Allow reducing resolution to save power -enterAndClear "packages/apps/DejaVu" -cp $patches"android_packages_apps_DejaVu/Android.mk" Android.mk #Add a build file - enterAndClear "packages/apps/FakeStore" sed -i 's|$(OUT_DIR)/target/|$(PWD)/$(OUT_DIR)/target/|' Android.mk; sed -i 's/ln -s /ln -sf /' Android.mk; @@ -146,9 +144,6 @@ patch -p1 < $patches"android_packages_apps_Settings/0001-Privacy_Guard-More_Perm enterAndClear "packages/apps/SetupWizard" patch -p1 < $patches"android_packages_apps_SetupWizard/0001-Remove_Analytics.patch" #Remove the rest of CMStats -enterAndClear "packages/apps/Silence" -cp $patches"android_packages_apps_Silence/Android.mk" Android.mk #Add a build file - enterAndClear "packages/apps/Updater" patch -p1 < $patches"android_packages_apps_Updater/0001-Server.patch" #Switch to our server diff --git a/Scripts/LineageOS-15.1/00init.sh b/Scripts/LineageOS-15.1/00init.sh index dbaa5865..e325fdd8 100644 --- a/Scripts/LineageOS-15.1/00init.sh +++ b/Scripts/LineageOS-15.1/00init.sh @@ -23,6 +23,7 @@ export base=$androidWorkspace"Build/LineageOS-15.1/"; export SIGNING_KEY_DIR=$androidWorkspace"Signing_Keys"; export OTA_PACKAGE_SIGNING_KEY=$SIGNING_KEY_DIR"/releasekey" +export prebuiltApps=$androidWorkspace"PrebuiltApps/"; export patches=$androidWorkspace"Patches/LineageOS-15.1/"; export cvePatchesLinux=$androidWorkspace"Patches/Linux/"; export cvePatchesAndroid=$androidWorkspace"Patches/Android/"; diff --git a/Scripts/LineageOS-15.1/Functions.sh b/Scripts/LineageOS-15.1/Functions.sh index 244a401f..a2b6f175 100644 --- a/Scripts/LineageOS-15.1/Functions.sh +++ b/Scripts/LineageOS-15.1/Functions.sh @@ -46,7 +46,7 @@ gitReset() { export -f gitReset; resetWorkspace() { - repo forall -c 'git add -A && git reset --hard' && rm -rf packages/apps/{FDroid,GmsCore,Silence} out && repo sync -j20 --force-sync; + repo forall -c 'git add -A && git reset --hard' && rm -rf packages/apps/{FDroid,GmsCore} out && repo sync -j20 --force-sync; } export -f resetWorkspace; diff --git a/Scripts/LineageOS-15.1/Patch.sh b/Scripts/LineageOS-15.1/Patch.sh index f0e8dab2..a628a71e 100755 --- a/Scripts/LineageOS-15.1/Patch.sh +++ b/Scripts/LineageOS-15.1/Patch.sh @@ -56,6 +56,7 @@ echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/a #top dir cp -r $patches"Fennec_DOS-Shim" $base"packages/apps/"; #Add a shim to install Fennec DOS without actually including the large APK +cp -r $prebuiltApps"android_vendor_FDroid_PrebuiltApps" $base"vendor/fdroid_prebuilt"; #Add the prebuilt apps #enterAndClear "bootable/recovery" #optipng -strip all res*/images/*.png; @@ -94,9 +95,6 @@ enterAndClear "lineage-sdk" awk -i inplace '!/WeatherManagerServiceBroker/' lineage/res/res/values/config.xml; #Disable Weather cp $patches"android_lineage-sdk/profile_default.xml" lineage/res/res/xml/profile_default.xml; #Replace default profiles with *way* better ones -enterAndClear "packages/apps/DejaVu" -cp $patches"android_packages_apps_DejaVu/Android.mk" Android.mk #Add a build file - enterAndClear "packages/apps/FakeStore" sed -i 's|$(OUT_DIR)/target/|$(PWD)/$(OUT_DIR)/target/|' Android.mk; sed -i 's/ln -s /ln -sf /' Android.mk; @@ -139,9 +137,6 @@ sed -i 's/GSETTINGS_PROVIDER = "com.google.settings";/GSETTINGS_PROVIDER = "com. enterAndClear "packages/apps/SetupWizard" patch -p1 < $patches"android_packages_apps_SetupWizard/0001-Remove_Analytics.patch" #Remove analytics -enterAndClear "packages/apps/Silence" -cp $patches"android_packages_apps_Silence/Android.mk" Android.mk #Add a build file - enterAndClear "packages/apps/Updater" patch -p1 < $patches"android_packages_apps_Updater/0001-Server.patch" #Switch to our server