Git-Mirrors/DivestOS
1
0
Fork 0
mirror of https://github.com/Divested-Mobile/DivestOS-Build.git synced 2024-10-01 01:35:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

More fixes and cleanup

Browse Source
This commit is contained in:
Tad 2018-06-02 18:28:40 -04:00
parent 2345e7ed7d
commit bf8f1e4d3d
10 changed files with 14 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Patches/LineageOS-14.1/android_vendor_cm/0001-SCE.patch
View File

@ -1,27 +0,0 @@
From 5b06904bd8fa8009881cf215a0ddecce2a48bdd5 Mon Sep 17 00:00:00 2001
From: Tad <tad@spotco.us>
Date: Sun, 18 Dec 2016 10:40:41 -0500
Subject: [PATCH] SC Extras
Change-Id: Iee06a1cf026e00fc7312454d90a0fef6fcda16e3
---
config/common.mk | 3 +++
1 file changed, 3 insertions(+)
diff --git a/config/common.mk b/config/common.mk
index ab54327..577235b 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -125,6 +125,9 @@ include vendor/cm/config/cm_audio.mk
# Theme engine
include vendor/cm/config/themes_common.mk
+# SC Extras
+include vendor/cm/config/sce.mk
+
ifneq ($(TARGET_DISABLE_CMSDK), true)
# CMSDK
include vendor/cm/config/cmsdk_common.mk
--
2.9.3

1
Patches/LineageOS-14.1/android_vendor_cm/sce-microG.mk
View File

@ -6,6 +6,5 @@ PRODUCT_PACKAGES += \
# UnifiedNLP Backends
PRODUCT_PACKAGES += \
DejaVuNlpBackend \
IchnaeaNlpBackend \
NominatimNlpBackend

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

@ -3,6 +3,10 @@ PRODUCT_PACKAGES += \
F-Droid \
F-DroidPrivilegedExtension
# UnifiedNLP Backends (DejaVu is always included even when microG is disabled to prevent deletion of a user's database)
PRODUCT_PACKAGES += \
DejaVuNlpBackend
# Others
PRODUCT_PACKAGES += \
CameraRoll \

27
Patches/LineageOS-15.1/android_vendor_lineage/0001-SCE.patch
View File

@ -1,27 +0,0 @@
From 7d1d784140abb4d77b5fcee84503460d2183aae9 Mon Sep 17 00:00:00 2001
From: Tad <tad@spotco.us>
Date: Mon, 12 Feb 2018 05:04:38 -0500
Subject: [PATCH] SC Extras
Change-Id: I24c048094f6fe8a6ca7bdb4931d9d41d9fc183bb
---
config/common.mk | 3 +++
1 file changed, 3 insertions(+)
diff --git a/config/common.mk b/config/common.mk
index 10c6ec77..a0ebbd86 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -103,6 +103,9 @@ ifeq ($(WITH_TWRP),true)
include vendor/lineage/config/twrp.mk
endif
+# SC Extras
+include vendor/lineage/config/sce.mk
+
# Bootanimation
PRODUCT_PACKAGES += \
bootanimation.zip
--
2.16.1

1
Patches/LineageOS-15.1/android_vendor_lineage/sce-microG.mk
View File

@ -6,6 +6,5 @@ PRODUCT_PACKAGES += \
# UnifiedNLP Backends
PRODUCT_PACKAGES += \
DejaVuNlpBackend \
IchnaeaNlpBackend \
NominatimNlpBackend

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

@ -3,6 +3,10 @@ PRODUCT_PACKAGES += \
F-Droid \
F-DroidPrivilegedExtension
# UnifiedNLP Backends (DejaVu is always included even when microG is disabled to prevent deletion of a user's database)
PRODUCT_PACKAGES += \
DejaVuNlpBackend
# Others
PRODUCT_PACKAGES += \
CameraRoll \

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

@ -188,7 +188,8 @@ rm -rf overlay/common/vendor/cmsdk/packages; #Remove analytics
awk -i inplace '!/50-cm.sh/' config/common.mk; #Make sure our hosts is always used
awk -i inplace '!/PRODUCT_EXTRA_RECOVERY_KEYS/' config/common.mk; #Remove extra keys
awk -i inplace '!/security\/lineage/' config/common.mk; #Remove extra keys
patch -p1 < $patches"android_vendor_cm/0001-SCE.patch"; #Include our extras such as MicroG and F-Droid
patch -p1 < $patches"android_vendor_cm/0001-SCE.patch";
sed -i '3iinclude vendor/cm/config/sce.mk' config/common.mk; #Include extra apps
cp $patches"android_vendor_cm/sce.mk" config/sce.mk;
if [ "$MICROG_INCLUDED" = true ]; then cp $patches"android_vendor_cm/sce-microG.mk" config/sce-microG.mk; fi;
if [ "$MICROG_INCLUDED" = true ]; then echo "include vendor/cm/config/sce-microG.mk" >> config/sce.mk; fi;
@ -224,7 +225,7 @@ cd $base;
find "device" -maxdepth 2 -mindepth 2 -type d -exec bash -c 'enhanceLocation "$0"' {} \;
find "device" -maxdepth 2 -mindepth 2 -type d -exec bash -c 'enableDexPreOpt "$0"' {} \;
find "device" -maxdepth 2 -mindepth 2 -type d -exec bash -c 'enableForcedEncryption "$0"' {} \;
if [ "$STRONG_ENCRYPTION_ENABLED" = true ]; then find "device" -maxdepth 2 -mindepth 2 -type d -exec bash -c 'enableStrongEncryption "$0"' {} \; fi;
#if [ "$STRONG_ENCRYPTION_ENABLED" = true ]; then find "device" -maxdepth 2 -mindepth 2 -type d -exec bash -c 'enableStrongEncryption "$0"' {} \; fi;
find "kernel" -maxdepth 2 -mindepth 2 -type d -exec bash -c 'hardenDefconfig "$0"' {} \;
cd $base;

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

@ -76,7 +76,6 @@ patchWorkspace() {
source build/envsetup.sh;
repopick -f 206123; #bionic: Sort and cache hosts file data for fast lookup
repopick -f 215174; #CallLogDatabase: Bump the version and try to re-run the version 5 upgrade path
repopick -f 214824 209584 209585 215010 214300; #g3-common
repopick -f 211404 211405 211406 211407 211408 211409; #d852
repopick -f 211396 214817; #d855

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

@ -190,7 +190,7 @@ rm -rf overlay/common/vendor/lineage-sdk/packages; #Remove analytics
if [ "$HOSTS_BLOCKING" = true ]; then awk -i inplace '!/50-lineage.sh/' config/common.mk; fi; #Make sure our hosts is always used
awk -i inplace '!/PRODUCT_EXTRA_RECOVERY_KEYS/' config/common.mk; #Remove extra keys
awk -i inplace '!/security\/lineage/' config/common.mk; #Remove extra keys
patch -p1 < $patches"android_vendor_lineage/0001-SCE.patch"; #Include our extras such as MicroG and F-Droid
sed -i '3iinclude vendor/lineage/config/sce.mk' config/common.mk; #Include extra apps
cp $patches"android_vendor_lineage/sce.mk" config/sce.mk;
if [ "$MICROG_INCLUDED" = true ]; then cp $patches"android_vendor_lineage/sce-microG.mk" config/sce-microG.mk; fi;
if [ "$MICROG_INCLUDED" = true ]; then echo "include vendor/lineage/config/sce-microG.mk" >> config/sce.mk; fi;
@ -229,7 +229,7 @@ cd $base;
find "device" -maxdepth 2 -mindepth 2 -type d -exec bash -c 'enhanceLocation "$0"' {} \;
find "device" -maxdepth 2 -mindepth 2 -type d -exec bash -c 'enableDexPreOpt "$0"' {} \;
find "device" -maxdepth 2 -mindepth 2 -type d -exec bash -c 'enableForcedEncryption "$0"' {} \;
if [ "$STRONG_ENCRYPTION_ENABLED" = true ]; then find "device" -maxdepth 2 -mindepth 2 -type d -exec bash -c 'enableStrongEncryption "$0"' {} \; fi;
#if [ "$STRONG_ENCRYPTION_ENABLED" = true ]; then find "device" -maxdepth 2 -mindepth 2 -type d -exec bash -c 'enableStrongEncryption "$0"' {} \; fi;
find "kernel" -maxdepth 2 -mindepth 2 -type d -exec bash -c 'hardenDefconfig "$0"' {} \;
cd $base;

3
Scripts/init.sh
View File

@ -20,13 +20,12 @@
#START OF USER CONFIGURABLE OPTIONS
export androidWorkspace="/mnt/Drive-3/"; #XXX: THIS MUST BE CORRECT TO BUILD!
export DEFAULT_DNS="OpenNIC"; #Sets default DNS, choices: Cloudflare, OpenNIC
export MALWARE_SCAN_ENABLED=true; #Set true to perform a fast scan on patchWorkspace() and a through scan on buildAll()
export MALWARE_SCAN_SETTING="quick"; #buildAll() scan speed. Options are quick, extra, slow, full
export MICROG_INCLUDED=true; #Switch to false to prevent inclusion of microG
export HOSTS_BLOCKING=true; #Switch to false to prevent inclusion of our HOSTS file
export STRONG_ENCRYPTION_ENABLED=false; #Switch to true to enable AES-256bit encryption XXX: THIS WILL BREAK EXISTING INSTALLS!
export STRONG_ENCRYPTION_ENABLED=false; #Switch to true to enable AES-256bit encryption XXX: THIS WILL **DESTROY** EXISTING INSTALLS!
export NON_COMMERCIAL_USE_PATCHES=false; #Switch to false to prevent inclusion of non-commercial use patches
#END OF USER CONFIGURABLE OPTIONS