From 91a6b29806187b8901f380bb541279693785b606 Mon Sep 17 00:00:00 2001 From: Tad Date: Fri, 13 Jul 2018 00:52:24 -0400 Subject: [PATCH] More overlay work --- Manifests/Manifest_LAOS-14.1.xml | 5 ----- Manifests/Manifest_LAOS-15.1.xml | 5 ----- .../{ => build}/target/product/lowram.mk | 0 Patches/Common/android_vendor_divested/divestos.mk | 13 +++++-------- .../android_vendor_divested/module_blocker.mk | 11 ++++++++++- .../frameworks/base/core/res/res/values/config.xml | 4 ---- .../SettingsProvider/res/values/defaults.xml | 1 + .../LineageSettingsProvider/res/values/defaults.xml | 4 +++- .../vendor/cmsdk/cm/res/res/values/config.xml | 1 + .../CMSettingsProvider/res/values/defaults.xml | 4 +++- Patches/Common/android_vendor_divested/packages.mk | 2 +- .../{extras => prebuilts}/etc/dns66.json | 0 Scripts/LineageOS-14.1/Functions.sh | 4 ++-- Scripts/LineageOS-14.1/Patch.sh | 5 +++-- Scripts/LineageOS-15.1/Functions.sh | 5 +++-- Scripts/LineageOS-15.1/Patch.sh | 5 +++-- 16 files changed, 35 insertions(+), 34 deletions(-) rename Patches/Common/android_vendor_divested/{ => build}/target/product/lowram.mk (100%) rename Patches/Common/android_vendor_divested/{extras => prebuilts}/etc/dns66.json (100%) diff --git a/Manifests/Manifest_LAOS-14.1.xml b/Manifests/Manifest_LAOS-14.1.xml index e2d30a4b..c04bed56 100644 --- a/Manifests/Manifest_LAOS-14.1.xml +++ b/Manifests/Manifest_LAOS-14.1.xml @@ -79,11 +79,6 @@ - - - - - diff --git a/Manifests/Manifest_LAOS-15.1.xml b/Manifests/Manifest_LAOS-15.1.xml index b17998f2..0baaa4c9 100644 --- a/Manifests/Manifest_LAOS-15.1.xml +++ b/Manifests/Manifest_LAOS-15.1.xml @@ -71,11 +71,6 @@ - - - - - diff --git a/Patches/Common/android_vendor_divested/target/product/lowram.mk b/Patches/Common/android_vendor_divested/build/target/product/lowram.mk similarity index 100% rename from Patches/Common/android_vendor_divested/target/product/lowram.mk rename to Patches/Common/android_vendor_divested/build/target/product/lowram.mk diff --git a/Patches/Common/android_vendor_divested/divestos.mk b/Patches/Common/android_vendor_divested/divestos.mk index 47e039fc..3d06bb30 100644 --- a/Patches/Common/android_vendor_divested/divestos.mk +++ b/Patches/Common/android_vendor_divested/divestos.mk @@ -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 diff --git a/Patches/Common/android_vendor_divested/module_blocker.mk b/Patches/Common/android_vendor_divested/module_blocker.mk index fea1515e..0c4b91cb 100644 --- a/Patches/Common/android_vendor_divested/module_blocker.mk +++ b/Patches/Common/android_vendor_divested/module_blocker.mk @@ -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) diff --git a/Patches/Common/android_vendor_divested/overlay/common/frameworks/base/core/res/res/values/config.xml b/Patches/Common/android_vendor_divested/overlay/common/frameworks/base/core/res/res/values/config.xml index d7d50f43..8af5b817 100644 --- a/Patches/Common/android_vendor_divested/overlay/common/frameworks/base/core/res/res/values/config.xml +++ b/Patches/Common/android_vendor_divested/overlay/common/frameworks/base/core/res/res/values/config.xml @@ -172,10 +172,6 @@ --> true - - @null - false @@ -11,4 +12,5 @@ 0 - + + diff --git a/Patches/Common/android_vendor_divested/overlay/common/vendor/cmsdk/cm/res/res/values/config.xml b/Patches/Common/android_vendor_divested/overlay/common/vendor/cmsdk/cm/res/res/values/config.xml index f9f9b98b..0e22e1e4 100644 --- a/Patches/Common/android_vendor_divested/overlay/common/vendor/cmsdk/cm/res/res/values/config.xml +++ b/Patches/Common/android_vendor_divested/overlay/common/vendor/cmsdk/cm/res/res/values/config.xml @@ -209,4 +209,5 @@ com.whatsapp.*,3 eu.chainfire.cfbench.*,2 + diff --git a/Patches/Common/android_vendor_divested/overlay/common/vendor/cmsdk/packages/CMSettingsProvider/res/values/defaults.xml b/Patches/Common/android_vendor_divested/overlay/common/vendor/cmsdk/packages/CMSettingsProvider/res/values/defaults.xml index f9b38e2e..94fb2f39 100644 --- a/Patches/Common/android_vendor_divested/overlay/common/vendor/cmsdk/packages/CMSettingsProvider/res/values/defaults.xml +++ b/Patches/Common/android_vendor_divested/overlay/common/vendor/cmsdk/packages/CMSettingsProvider/res/values/defaults.xml @@ -1,5 +1,6 @@ + false @@ -11,4 +12,5 @@ 0 - + + diff --git a/Patches/Common/android_vendor_divested/packages.mk b/Patches/Common/android_vendor_divested/packages.mk index 42f74837..d64907f5 100644 --- a/Patches/Common/android_vendor_divested/packages.mk +++ b/Patches/Common/android_vendor_divested/packages.mk @@ -18,7 +18,7 @@ PRODUCT_PACKAGES += \ # Replacements PRODUCT_PACKAGES += \ CameraRoll \ - FennecDOS + FennecDOS \ K9Mail \ Silence \ VanillaMusic diff --git a/Patches/Common/android_vendor_divested/extras/etc/dns66.json b/Patches/Common/android_vendor_divested/prebuilts/etc/dns66.json similarity index 100% rename from Patches/Common/android_vendor_divested/extras/etc/dns66.json rename to Patches/Common/android_vendor_divested/prebuilts/etc/dns66.json diff --git a/Scripts/LineageOS-14.1/Functions.sh b/Scripts/LineageOS-14.1/Functions.sh index dc2b58d7..b4f001c5 100644 --- a/Scripts/LineageOS-14.1/Functions.sh +++ b/Scripts/LineageOS-14.1/Functions.sh @@ -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"; diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh index 15a4e91d..e8b5eb14 100755 --- a/Scripts/LineageOS-14.1/Patch.sh +++ b/Scripts/LineageOS-14.1/Patch.sh @@ -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 # diff --git a/Scripts/LineageOS-15.1/Functions.sh b/Scripts/LineageOS-15.1/Functions.sh index 8d7796fa..965bf353 100644 --- a/Scripts/LineageOS-15.1/Functions.sh +++ b/Scripts/LineageOS-15.1/Functions.sh @@ -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"; diff --git a/Scripts/LineageOS-15.1/Patch.sh b/Scripts/LineageOS-15.1/Patch.sh index d59c0642..52bcaeb3 100755 --- a/Scripts/LineageOS-15.1/Patch.sh +++ b/Scripts/LineageOS-15.1/Patch.sh @@ -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 #