Git-Mirrors
/
DivestOS
mirror of https://github.com/Divested-Mobile/DivestOS-Build.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Initial support for including prebuilt apps from F-Droid 

FDroid will come later, microG will probably stay as is.
This commit is contained in:
Tad 2018-03-13 23:07:41 -04:00
parent ad9f1aa8ce
commit 4053ad6082
16 changed files with 20 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -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

8
Manifests/Manifest_LAOS-14.1.xml
View File

@ -91,18 +91,10 @@
<project path="packages/apps/GsfProxy" name="microg/android_packages_apps_GsfProxy" remote="github" revision="master" />
<project path="packages/apps/FakeStore" name="microg/android_packages_apps_FakeStore" remote="github" revision="master" />
<!-- UnifiedNLP Backends -->
<project path="packages/apps/DejaVu" name="n76/DejaVu" remote="github" revision="master" />
<project path="packages/apps/IchnaeaNlpBackend" name="microg/IchnaeaNlpBackend" remote="github" revision="master" />
<project path="packages/apps/NominatimGeocoderBackend" name="microg/NominatimGeocoderBackend" remote="github" revision="master" />
<!-- F-Droid -->
<remote name="fdroid" fetch="https://gitlab.com/fdroid/" />
<project path="packages/apps/FDroidPrivilegedExtension" name="privileged-extension.git" remote="fdroid" revision="master" />
<project path="packages/apps/FDroid" name="fdroidclient.git" remote="fdroid" revision="master" />
<!-- Misc -->
<project path="packages/apps/Silence" name="SilenceIM/Silence" remote="github" revision="master" />
<!-- END OF ADDITIONAL REPOS -->

8
Manifests/Manifest_LAOS-15.1.xml
View File

@ -76,18 +76,10 @@
<project path="packages/apps/GsfProxy" name="microg/android_packages_apps_GsfProxy" remote="github" revision="master" />
<project path="packages/apps/FakeStore" name="microg/android_packages_apps_FakeStore" remote="github" revision="master" />
<!-- UnifiedNLP Backends -->
<project path="packages/apps/DejaVu" name="n76/DejaVu" remote="github" revision="master" />
<project path="packages/apps/IchnaeaNlpBackend" name="microg/IchnaeaNlpBackend" remote="github" revision="master" />
<project path="packages/apps/NominatimGeocoderBackend" name="microg/NominatimGeocoderBackend" remote="github" revision="master" />
<!-- F-Droid -->
<remote name="fdroid" fetch="https://gitlab.com/fdroid/" />
<project path="packages/apps/FDroidPrivilegedExtension" name="privileged-extension.git" remote="fdroid" revision="master" />
<project path="packages/apps/FDroid" name="fdroidclient.git" remote="fdroid" revision="master" />
<!-- Misc -->
<project path="packages/apps/Silence" name="SilenceIM/Silence" remote="github" revision="master" />
<!-- END OF ADDITIONAL REPOS -->

28
Patches/LineageOS-14.1/android_packages_apps_DejaVu/Android.mk
View File

@ -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)

30
Patches/LineageOS-14.1/android_packages_apps_Silence/Android.mk
View File

@ -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)

6
Patches/LineageOS-14.1/android_vendor_cm/sce.mk
View File

@ -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

28
Patches/LineageOS-15.1/android_packages_apps_DejaVu/Android.mk
View File

@ -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)

30
Patches/LineageOS-15.1/android_packages_apps_Silence/Android.mk
View File

@ -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)

6
Patches/LineageOS-15.1/android_vendor_lineage/sce.mk
View File

@ -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

1
PrebuiltApps Submodule

@ -0,0 +1 @@
Subproject commit df494cf7ca300cf448ce26c0f3eb33799f5dd913

1
Scripts/LineageOS-14.1/00init.sh
View File

@ -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/";

2
Scripts/LineageOS-14.1/Functions.sh
View File

@ -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;

7
Scripts/LineageOS-14.1/Patch.sh
View File

@ -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

1
Scripts/LineageOS-15.1/00init.sh
View File

@ -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/";

2
Scripts/LineageOS-15.1/Functions.sh
View File

@ -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;

7
Scripts/LineageOS-15.1/Patch.sh
View File

@ -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