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 overlay work

Browse Source
This commit is contained in:
Tad 2018-07-13 00:52:24 -04:00
parent 2ee7a13a80
commit 91a6b29806
16 changed files with 35 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Manifests/Manifest_LAOS-14.1.xml
View File

@ -79,11 +79,6 @@
<!-- START OF ADDITIONAL REPOS -->
<project path="external/swiftshader" name="google/swiftshader" remote="github" revision="master" />
<!-- MicroG -->
<project path="packages/apps/GmsCore" name="microg/android_packages_apps_GmsCore" remote="github" revision="master" />
<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" />
<!-- F-Droid -->
<remote name="fdroid" fetch="https://gitlab.com/fdroid/" />
<project path="packages/apps/FDroidPrivilegedExtension" name="privileged-extension.git" remote="fdroid" revision="master" />

5
Manifests/Manifest_LAOS-15.1.xml
View File

@ -71,11 +71,6 @@
<!-- END OF BRANCH SWITCHING -->
<!-- START OF ADDITIONAL REPOS -->
<!-- MicroG -->
<project path="packages/apps/GmsCore" name="microg/android_packages_apps_GmsCore" remote="github" revision="master" />
<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" />
<!-- F-Droid -->
<remote name="fdroid" fetch="https://gitlab.com/fdroid/" />
<project path="packages/apps/FDroidPrivilegedExtension" name="privileged-extension.git" remote="fdroid" revision="master" />

0
Patches/Common/android_vendor_divested/target/product/lowram.mk → Patches/Common/android_vendor_divested/build/target/product/lowram.mk
View File

13
Patches/Common/android_vendor_divested/divestos.mk
View File

@ -3,6 +3,8 @@
#PRODUCT_VERSION_MINOR = 0
#PRODUCT_VERSION_MAINTENANCE := 0
#Overlays
LOCAL_AAPT_FLAGS += --auto-add-overlay
DEVICE_PACKAGE_OVERLAYS += vendor/divested/overlay/common
#Extra settings
@ -10,21 +12,16 @@ PRODUCT_BUILD_PROP_OVERRIDES += \
BUILD_UTC_DATE=0
PRODUCT_PROPERTY_OVERRIDES += \
keyguard.no_require_sim=true \
ro.config.notification_sound=Pong.ogg \
ro.config.alarm_alert=Alarm_Buzzer.ogg \
keyguard.no_require_sim=true \
ro.build.selinux=1 \
ro.storage_manager.enabled=true
ifneq ($(TARGET_BUILD_VARIANT),eng)
ADDITIONAL_DEFAULT_PROPERTIES += \
ro.adb.secure=1
endif
#Copy extra files
PRODUCT_COPY_FILES += \
vendor/divested/extras/etc/dns66.json:system/etc/dns66/settings.json
vendor/divested/prebuilts/etc/dns66.json:system/etc/dns66/settings.json
#Include packages
PRODUCT_PACKAGES += ModuleBlocker
#PRODUCT_PACKAGES += ModuleBlocker
include vendor/divested/packages.mk

11
Patches/Common/android_vendor_divested/module_blocker.mk
View File

@ -22,6 +22,15 @@ LOCAL_OVERRIDES_PACKAGES := \
sshd_config \
ssh-keygen \
start-ssh \
rsync
rsync \
su \
Stk \
libdrmclearkeyplugin \
libclearkeycasplugin \
CtsShimPrebuilt \
CtsShimPrivPrebuilt \
MusicFX
# drmserver \
# libfwdlockengine \
include $(BUILD_PREBUILT)

4
Patches/Common/android_vendor_divested/overlay/common/frameworks/base/core/res/res/values/config.xml
View File

@ -172,10 +172,6 @@
-->
<bool name="config_enableNetworkLocationOverlay" translatable="false">true</bool>
<!-- Package name providing network location support. Used only when
config_enableNetworkLocationOverlay is false. -->
<string name="config_networkLocationProviderPackageName" translatable="false">@null</string>
<!-- Whether to enable fused location provider overlay which allows fused
location provider to be replaced by an app at run-time. When disabled,
only the config_fusedLocationProviderPackageName package will be

1
Patches/Common/android_vendor_divested/overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
View File

@ -19,4 +19,5 @@
<bool name="def_backup_enabled">false</bool>
<string name="def_backup_transport" translatable="false">android/com.android.internal.backup.LocalTransport</string>
</resources>

4
Patches/Common/android_vendor_divested/overlay/common/lineage-sdk/packages/LineageSettingsProvider/res/values/defaults.xml
View File

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- Default for LineageSettings.Secure.STATS_COLLECTION -->
<bool name="def_stats_collection">false</bool>
@ -11,4 +12,5 @@
<!-- Default value of LineageSettings.System.ENABLE_REVERSE_LOOKUP -->
<integer name="def_reverse_lookup">0</integer>
<resources>
</resources>

1
Patches/Common/android_vendor_divested/overlay/common/vendor/cmsdk/cm/res/res/values/config.xml vendored
View File

@ -209,4 +209,5 @@
<item>com.whatsapp.*,3</item>
<item>eu.chainfire.cfbench.*,2</item>
</string-array>
</resources>

4
Patches/Common/android_vendor_divested/overlay/common/vendor/cmsdk/packages/CMSettingsProvider/res/values/defaults.xml vendored
View File

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- Default for CMSettings.Secure.STATS_COLLECTION -->
<bool name="def_stats_collection">false</bool>
@ -11,4 +12,5 @@
<!-- Default value of LineageSettings.System.ENABLE_REVERSE_LOOKUP -->
<integer name="def_reverse_lookup">0</integer>
<resources>
</resources>

2
Patches/Common/android_vendor_divested/packages.mk
View File

@ -18,7 +18,7 @@ PRODUCT_PACKAGES += \
# Replacements
PRODUCT_PACKAGES += \
CameraRoll \
FennecDOS
FennecDOS \
K9Mail \
Silence \
VanillaMusic

0
Patches/Common/android_vendor_divested/extras/etc/dns66.json → Patches/Common/android_vendor_divested/prebuilts/etc/dns66.json
View File

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

@ -23,7 +23,7 @@ patchAllKernels() {
export -f patchAllKernels;
resetWorkspace() {
repo forall -c 'git add -A && git reset --hard' && rm -rf packages/apps/{FDroid,GmsCore} out && repo sync -j20 --force-sync;
repo forall -c 'git add -A && git reset --hard' && rm -rf packages/apps/FDroid out && repo sync -j20 --force-sync;
}
export -f resetWorkspace;
@ -139,7 +139,7 @@ export -f enableDexPreOptFull;
enableLowRam() {
cd "$DOS_BUILD_BASE$1";
if [ -f lineage.mk ]; then echo '$(call inherit-product, vendor/divested/target/product/lowram.mk)' >> lineage.mk; fi;
if [ -f lineage.mk ]; then echo '$(call inherit-product, vendor/divested/build/target/product/lowram.mk)' >> lineage.mk; fi;
if [ -f BoardConfig.mk ]; then echo 'MALLOC_SVELTE := true' >> BoardConfig.mk; fi;
if [ -f BoardConfigCommon.mk ]; then echo 'MALLOC_SVELTE := true' >> BoardConfigCommon.mk; fi;
echo "Enabled lowram for $1";

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

@ -66,6 +66,7 @@ patch -p1 < "$DOS_PATCHES/android_bootable_recovery/0001-Squash_Menus.patch"; #W
enterAndClear "build";
patch -p1 < "$DOS_PATCHES/android_build/0001-Automated_Build_Signing.patch"; #Automated build signing (CopperheadOS-13.0)
sed -i '50i$(my_res_package): PRIVATE_AAPT_FLAGS += --auto-add-overlay' core/aapt2.mk;
enterAndClear "device/qcom/sepolicy";
patch -p1 < "$DOS_PATCHES/android_device_qcom_sepolicy/0001-Camera_Fix.patch"; #Fix camera on user builds XXX: REMOVE THIS TRASH
@ -173,8 +174,8 @@ if [ "$DOS_DEBLOBBER_REMOVE_AUDIOFX" = true ]; then awk -i inplace '!/CMAudioSer
sed -i 's/shouldUseOptimizations(weight)/true/' cm/lib/main/java/org/cyanogenmod/platform/internal/PerformanceManagerService.java; #Per app performance profiles fix
enter "vendor/divested";
if [ "$DOS_MICROG_INCLUDED" = "FULL" ]; then echo "PRODUCT_PACKAGES += microG" >> packages.mk;
if [ "$DOS_HOSTS_BLOCKING" = false ]; then echo "PRODUCT_PACKAGES += DNS66" >> packages.mk;
if [ "$DOS_MICROG_INCLUDED" = "FULL" ]; then echo "PRODUCT_PACKAGES += microG" >> packages.mk; fi;
if [ "$DOS_HOSTS_BLOCKING" = false ]; then echo "PRODUCT_PACKAGES += DNS66" >> packages.mk; fi;
#
#END OF ROM CHANGES
#

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

@ -23,7 +23,7 @@ patchAllKernels() {
export -f patchAllKernels;
resetWorkspace() {
repo forall -c 'git add -A && git reset --hard' && rm -rf packages/apps/{FDroid,GmsCore} out && repo sync -j20 --force-sync;
repo forall -c 'git add -A && git reset --hard' && rm -rf packages/apps/FDroid out && repo sync -j20 --force-sync;
}
export -f resetWorkspace;
@ -82,6 +82,7 @@ patchWorkspace() {
if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanForMalware false "$DOS_PREBUILT_APPS $DOS_BUILD_BASE/build $DOS_BUILD_BASE/device $DOS_BUILD_BASE/vendor/lineage"; fi;
source build/envsetup.sh;
#repopick 219020 219022; #ab-neverallow-user
repopick -f 214824 209584 209585 215010 214300; #g3-common
repopick -f 211404 211405 211406 211407 211408 211409; #d852
@ -127,7 +128,7 @@ export -f enableDexPreOptFull;
enableLowRam() {
cd "$DOS_BUILD_BASE$1";
#if [ -f lineage.mk ]; then echo '$(call inherit-product, $(SRC_TARGET_DIR)/product/go_defaults.mk)' >> lineage.mk; fi;
if [ -f lineage.mk ]; then echo '$(call inherit-product, vendor/divested/target/product/lowram.mk)' >> lineage.mk; fi;
if [ -f lineage.mk ]; then echo '$(call inherit-product, vendor/divested/build/target/product/lowram.mk)' >> lineage.mk; fi;
if [ -f BoardConfig.mk ]; then echo 'MALLOC_SVELTE := true' >> BoardConfig.mk; fi;
if [ -f BoardConfigCommon.mk ]; then echo 'MALLOC_SVELTE := true' >> BoardConfigCommon.mk; fi;
echo "Enabled lowram for $1";

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

@ -64,6 +64,7 @@ cp -r "$DOS_PATCHES_COMMON""android_vendor_divested/." "$DOS_BUILD_BASE""vendor/
enterAndClear "build/make";
patch -p1 < "$DOS_PATCHES/android_build/0001-Automated_Build_Signing.patch"; #Automated build signing (CopperheadOS-13.0)
awk -i inplace '!/PRODUCT_EXTRA_RECOVERY_KEYS/' core/product.mk;
sed -i '57i$(my_res_package): PRIVATE_AAPT_FLAGS += --auto-add-overlay' core/aapt2.mk;
enterAndClear "device/lineage/sepolicy";
git revert c9b0d95630b82cd0ad1a0fc633c6d59c2cb8aad7 37422f7df389f3ae5a34ee3d6dd9354217f9c536; #neverallow violation
@ -166,8 +167,8 @@ 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";
if [ "$DOS_MICROG_INCLUDED" = "FULL" ]; then echo "PRODUCT_PACKAGES += microG" >> packages.mk;
if [ "$DOS_HOSTS_BLOCKING" = false ]; then echo "PRODUCT_PACKAGES += DNS66" >> packages.mk;
if [ "$DOS_MICROG_INCLUDED" = "FULL" ]; then echo "PRODUCT_PACKAGES += microG" >> packages.mk; fi;
if [ "$DOS_HOSTS_BLOCKING" = false ]; then echo "PRODUCT_PACKAGES += DNS66" >> packages.mk; fi;
#
#END OF ROM CHANGES
#