From 2b0aaa5e330819f71f16effa34c674be0652e1b9 Mon Sep 17 00:00:00 2001 From: AnierinB Date: Mon, 22 Apr 2024 13:54:00 -0700 Subject: [PATCH] lynx: Initialize for Evolution X 11.x Signed-off-by: AnierinB --- BoardConfigEvolution.mk | 4 ++++ device-evolution.mk | 9 +++++++++ device-lynx.mk | 13 ++----------- evolution.dependencies | 14 ++++++++++++++ init.insmod.lynx.cfg | 18 ------------------ lineage.dependencies | 11 ----------- lineage_lynx.mk | 2 ++ lynx/BoardConfig.mk | 1 + lynx/BoardConfigEvolution.mk | 6 ++++++ lynx/device-evolution.mk | 8 ++++++++ .../Settings/res/values/evolution_strings.xml | 12 ++++++++++++ lynx/proprietary-files.txt | 7 +++++-- 12 files changed, 63 insertions(+), 42 deletions(-) create mode 100644 BoardConfigEvolution.mk create mode 100644 device-evolution.mk create mode 100644 evolution.dependencies delete mode 100644 init.insmod.lynx.cfg delete mode 100644 lineage.dependencies create mode 100644 lynx/BoardConfigEvolution.mk create mode 100644 lynx/device-evolution.mk create mode 100644 lynx/overlay-evolution/packages/apps/Settings/res/values/evolution_strings.xml diff --git a/BoardConfigEvolution.mk b/BoardConfigEvolution.mk new file mode 100644 index 0000000..a833c7e --- /dev/null +++ b/BoardConfigEvolution.mk @@ -0,0 +1,4 @@ +# +# SPDX-FileCopyrightText: 2024 The Evolution X Project +# SPDX-License-Identifier: Apache-2.0 +# diff --git a/device-evolution.mk b/device-evolution.mk new file mode 100644 index 0000000..4928873 --- /dev/null +++ b/device-evolution.mk @@ -0,0 +1,9 @@ +# +# Copyright (C) 2024 The Evolution X Project +# +# SPDX-License-Identifier: Apache-2.0 +# + +DEVICE_PACKAGE_OVERLAYS += $(DEVICE_PATH)/overlay-evolution + +TARGET_HAS_UDFPS += true diff --git a/device-lynx.mk b/device-lynx.mk index 01668ec..1e1bae1 100644 --- a/device-lynx.mk +++ b/device-lynx.mk @@ -15,9 +15,8 @@ # TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_LYNX_VERSION) -# Keeps flexibility for kasan and ufs builds -TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_LYNX_DIR) -TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_LYNX_DIR)/kernel-headers +TARGET_KERNEL_DIR := device/google/lynx-kernels/evolution +TARGET_BOARD_KERNEL_HEADERS := $(TARGET_KERNEL_DIR)/kernel-headers DEVICE_PACKAGE_OVERLAYS += device/google/lynx/lynx/overlay @@ -39,14 +38,6 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/google/lynx/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.lynx.rc -# insmod files. Kernel 5.10 prebuilts don't provide these yet, so provide our -# own copy if they're not in the prebuilts. -# TODO(b/369686096): drop this when 5.10 is gone. -ifeq ($(wildcard $(TARGET_KERNEL_DIR)/init.insmod.*.cfg),) -PRODUCT_COPY_FILES += \ - device/google/lynx/init.insmod.lynx.cfg:$(TARGET_COPY_OUT_VENDOR_DLKM)/etc/init.insmod.lynx.cfg -endif - # Camera PRODUCT_COPY_FILES += \ device/google/lynx/media_profiles_lynx.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml diff --git a/evolution.dependencies b/evolution.dependencies new file mode 100644 index 0000000..611c578 --- /dev/null +++ b/evolution.dependencies @@ -0,0 +1,14 @@ +[ + { + "repository": "device_google_gs201", + "target_path": "device/google/gs201" + }, + { + "repository": "device_google_lynx-kernels_evolution", + "target_path": "device/google/lynx-kernels/evolution" + }, + { + "repository": "vendor_google_lynx", + "target_path": "vendor/google/lynx" + } +] diff --git a/init.insmod.lynx.cfg b/init.insmod.lynx.cfg deleted file mode 100644 index 1b88597..0000000 --- a/init.insmod.lynx.cfg +++ /dev/null @@ -1,18 +0,0 @@ -########################################################## -# init.insmod.lynx.cfg # -# This file contains lynx specific kernel modules # -# to load at init time by init.insmod.sh script # -########################################################## - -# Load device specific kernel modules -# Modules here will be loaded *after* all common modules -modprobe|snd-soc-cs35l41-spi.ko -modprobe|goodix_brl_touch.ko -modprobe|focal_touch.ko -modprobe|cs40l26-i2c.ko -modprobe|snd-soc-cs40l26.ko - -# All device specific modules loaded -setprop|vendor.device.modules.ready -setprop|vendor.all.modules.ready -setprop|vendor.all.devices.ready diff --git a/lineage.dependencies b/lineage.dependencies deleted file mode 100644 index c301eb9..0000000 --- a/lineage.dependencies +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - "repository": "android_device_google_gs201", - "target_path": "device/google/gs201" - }, - { - "repository": "device/google/lynx-kernels/6.1", - "target_path": "device/google/lynx-kernels/6.1", - "remote": "aosp-lynx" - } -] diff --git a/lineage_lynx.mk b/lineage_lynx.mk index 4b38446..e8eef2f 100644 --- a/lineage_lynx.mk +++ b/lineage_lynx.mk @@ -14,7 +14,9 @@ DEVICE_PATH := device/google/lynx VENDOR_PATH := vendor/google/lynx $(call inherit-product, $(DEVICE_PATH)/aosp_$(DEVICE_CODENAME).mk) $(call inherit-product, device/google/gs201/lineage_common.mk) +$(call inherit-product, device/google/gs201/evolution_common.mk) $(call inherit-product, $(DEVICE_PATH)/$(DEVICE_CODENAME)/device-lineage.mk) +$(call inherit-product, $(DEVICE_PATH)/$(DEVICE_CODENAME)/device-evolution.mk) # Device identifier. This must come after all inclusions PRODUCT_BRAND := google diff --git a/lynx/BoardConfig.mk b/lynx/BoardConfig.mk index 304df80..4f69ddd 100644 --- a/lynx/BoardConfig.mk +++ b/lynx/BoardConfig.mk @@ -47,3 +47,4 @@ include device/google/gs201/wifi/qcom/BoardConfig-wifi.mk DEVICE_PATH := device/google/lynx VENDOR_PATH := vendor/google/lynx include $(DEVICE_PATH)/$(TARGET_BOOTLOADER_BOARD_NAME)/BoardConfigLineage.mk +include $(DEVICE_PATH)/$(TARGET_BOOTLOADER_BOARD_NAME)/BoardConfigEvolution.mk diff --git a/lynx/BoardConfigEvolution.mk b/lynx/BoardConfigEvolution.mk new file mode 100644 index 0000000..87b71af --- /dev/null +++ b/lynx/BoardConfigEvolution.mk @@ -0,0 +1,6 @@ +# +# SPDX-FileCopyrightText: 2024 The Evolution X Project +# SPDX-License-Identifier: Apache-2.0 +# + +include $(DEVICE_PATH)/BoardConfigEvolution.mk diff --git a/lynx/device-evolution.mk b/lynx/device-evolution.mk new file mode 100644 index 0000000..6065670 --- /dev/null +++ b/lynx/device-evolution.mk @@ -0,0 +1,8 @@ +# +# SPDX-FileCopyrightText: 2024 The Evolution X Project +# SPDX-License-Identifier: Apache-2.0 +# + +$(call inherit-product, $(DEVICE_PATH)/device-evolution.mk) + +DEVICE_PACKAGE_OVERLAYS += $(DEVICE_PATH)/$(DEVICE_CODENAME)/overlay-evolution diff --git a/lynx/overlay-evolution/packages/apps/Settings/res/values/evolution_strings.xml b/lynx/overlay-evolution/packages/apps/Settings/res/values/evolution_strings.xml new file mode 100644 index 0000000..8d8d1db --- /dev/null +++ b/lynx/overlay-evolution/packages/apps/Settings/res/values/evolution_strings.xml @@ -0,0 +1,12 @@ + + + + + + + Anierin Bliss + https://PayPal.me/AnierinB + diff --git a/lynx/proprietary-files.txt b/lynx/proprietary-files.txt index 7a3f7b3..5cf7132 100644 --- a/lynx/proprietary-files.txt +++ b/lynx/proprietary-files.txt @@ -13,6 +13,9 @@ product/etc/firmware/music_detector.sound_model product/etc/firmware/music_detector.sound_model_2 product/etc/firmware/music_detector.sound_model_tflite +# Camera +product/priv-app/GoogleCamera/GoogleCamera.apk;OVERRIDES=Aperture,Camera2;PRESIGNED + # Camera extensions product/etc/permissions/androidx.camera.extensions.impl.xml product/priv-app/PixelCameraServices/PixelCameraServices.apk;PRESIGNED @@ -40,7 +43,7 @@ product/priv-app/HotwordEnrollmentXGoogleFUSIONPro/HotwordEnrollmentXGoogleFUSIO product/etc/sysconfig/allowlist_com.shannon.imsservice.xml # Permissions -product/etc/permissions/privapp-permissions-google-p.xml:product/etc/permissions/privapp-permissions-google-p-lineage.xml +product/etc/permissions/privapp-permissions-google-p.xml:product/etc/permissions/privapp-permissions-google-p-evolution.xml product/etc/sysconfig/GoogleCamera_6gb_or_more_ram.xml product/etc/sysconfig/google-hiddenapi-package-whitelist.xml product/etc/sysconfig/nexus.xml @@ -130,7 +133,7 @@ system_ext/priv-app/ShannonIms/ShannonIms.apk;PRESIGNED system_ext/priv-app/ShannonRcs/ShannonRcs.apk;PRESIGNED # Permissions -system_ext/etc/permissions/privapp-permissions-google-se.xml:system_ext/etc/permissions/privapp-permissions-google-se-lineage.xml +system_ext/etc/permissions/privapp-permissions-google-se.xml:system_ext/etc/permissions/privapp-permissions-google-se-evolution.xml # Radio system_ext/etc/default-permissions/default-permissions-euiccpixel.xml