From ea3fbad21a0874e5215003596cebc63ace7066c5 Mon Sep 17 00:00:00 2001 From: Andy CrossGate Yan Date: Sun, 8 Aug 2021 01:43:40 +0000 Subject: [PATCH 1/9] treble: Lineage-ify Squash of: - Proper target names - Remove fsck SELinux labels - treble: Add overlay-lineage - treble: Don't specify config_wallpaperCropperPackage - treble: Don't handle apns-conf Change-Id: I25eee7a3804f335430a447ae1424402d7e37851b --- base-pre.mk | 3 - base.mk | 12 +-- generate.sh | 4 +- .../lineage/res/res/values/config.xml | 81 +++++++++++++++++++ .../base/core/res/res/values/config.xml | 1 - 5 files changed, 90 insertions(+), 11 deletions(-) create mode 100644 overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml diff --git a/base-pre.mk b/base-pre.mk index 6a317e4..e69de29 100644 --- a/base-pre.mk +++ b/base-pre.mk @@ -1,3 +0,0 @@ -#Use a more decent APN config -PRODUCT_COPY_FILES += \ - device/sample/etc/apns-full-conf.xml:system/etc/apns-conf.xml diff --git a/base.mk b/base.mk index 348799e..17bfdc3 100644 --- a/base.mk +++ b/base.mk @@ -17,12 +17,14 @@ PRODUCT_COPY_FILES += \ device/phh/treble/bluetooth/audio/config/sysbta_audio_policy_configuration.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/sysbta_audio_policy_configuration.xml \ device/phh/treble/bluetooth/audio/config/sysbta_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/sysbta_audio_policy_configuration_7_0.xml -#Use a more decent APN config -PRODUCT_COPY_FILES += \ - device/sample/etc/apns-full-conf.xml:system/etc/apns-conf.xml - SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS += device/phh/treble/sepolicy -PRODUCT_PACKAGE_OVERLAYS += device/phh/treble/overlay + +PRODUCT_PACKAGE_OVERLAYS += \ + device/phh/treble/overlay \ + device/phh/treble/overlay-lineage + +PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS += \ + device/phh/treble/overlay-lineage/lineage-sdk $(call inherit-product, vendor/hardware_overlay/overlay.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) diff --git a/generate.sh b/generate.sh index 9c20eb5..89fa88b 100644 --- a/generate.sh +++ b/generate.sh @@ -54,7 +54,7 @@ for part in a ab;do su_suffix='N' if [ "$su" == "yes" ];then su_suffix='S' - extra_packages+=' phh-su me.phh.superuser' + extra_packages+=' phh-su me.phh.superuser su' fi part_suffix='a' @@ -64,7 +64,7 @@ for part in a ab;do optional_base='$(call inherit-product, device/phh/treble/base-sas.mk)' fi - target="treble_${arch}_${part_suffix}${apps_suffix}${su_suffix}" + target="lineage_${arch}_${part_suffix}${apps_suffix}${su_suffix}" baseArch="$arch" if [ "$arch" = "a64" ];then diff --git a/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml b/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml new file mode 100644 index 0000000..8df673a --- /dev/null +++ b/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml @@ -0,0 +1,81 @@ + + + + + true + + + 255 + + + 127 + + + 127 + diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index 09895a4..fa07f40 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -22,7 +22,6 @@ "M50 0C77.6 0 100 22.4 100 50C100 77.6 77.6 100 50 100C22.4 100 0 77.6 0 50C0 22.4 22.4 0 50 0Z" true - com.android.wallpaperpicker true 5 true -- 2.34.1