diff --git a/BoardConfigEvolution.mk b/BoardConfigEvolution.mk new file mode 100644 index 00000000..a833c7e9 --- /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/caiman/BoardConfig.mk b/caiman/BoardConfig.mk index 62d69ab9..70ab2afa 100644 --- a/caiman/BoardConfig.mk +++ b/caiman/BoardConfig.mk @@ -40,3 +40,4 @@ include device/google/caimito/wifi/BoardConfig-wifi.mk DEVICE_PATH := device/google/caimito VENDOR_PATH := vendor/google/caiman include $(DEVICE_PATH)/$(TARGET_BOOTLOADER_BOARD_NAME)/BoardConfigLineage.mk +include $(DEVICE_PATH)/$(TARGET_BOOTLOADER_BOARD_NAME)/BoardConfigEvolution.mk diff --git a/caiman/BoardConfigEvolution.mk b/caiman/BoardConfigEvolution.mk new file mode 100644 index 00000000..87b71afb --- /dev/null +++ b/caiman/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/caiman/device-evolution.mk b/caiman/device-evolution.mk new file mode 100644 index 00000000..60656709 --- /dev/null +++ b/caiman/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/caiman/overlay-evolution/packages/apps/Settings/res/values/evolution_strings.xml b/caiman/overlay-evolution/packages/apps/Settings/res/values/evolution_strings.xml new file mode 100644 index 00000000..687d2317 --- /dev/null +++ b/caiman/overlay-evolution/packages/apps/Settings/res/values/evolution_strings.xml @@ -0,0 +1,12 @@ + + + + + + + Oscar Mariscal + https://PayPal.me/osmjr1019 + diff --git a/caiman/proprietary-files.txt b/caiman/proprietary-files.txt index 7af588c9..3d36a172 100644 --- a/caiman/proprietary-files.txt +++ b/caiman/proprietary-files.txt @@ -17,6 +17,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 @@ -44,7 +47,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 @@ -160,7 +163,7 @@ system_ext/etc/sysconfig/sysconfig_com.google.pixel.iwlan.xml system_ext/priv-app/PixelIwlan/PixelIwlan.apk # 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 diff --git a/device-caiman.mk b/device-caiman.mk index 0d95473c..b44427b3 100644 --- a/device-caiman.mk +++ b/device-caiman.mk @@ -32,19 +32,13 @@ else TARGET_LINUX_KERNEL_VERSION ?= 6.1 endif -ifdef RELEASE_KERNEL_CAIMAN_DIR -TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_CAIMAN_DIR) -TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_CAIMAN_DIR)/kernel-headers +TARGET_KERNEL_DIR := device/google/caimito-kernels/evolution +TARGET_BOARD_KERNEL_HEADERS := $(TARGET_KERNEL_DIR)/kernel-headers ifneq ($(TARGET_BOOTS_16K),true) PRODUCT_16K_DEVELOPER_OPTION := $(RELEASE_GOOGLE_CAIMAN_16K_DEVELOPER_OPTION) endif -else -TARGET_KERNEL_DIR ?= device/google/caimito-kernels/6.1/24D1 -TARGET_BOARD_KERNEL_HEADERS ?= device/google/caimito-kernels/6.1/24D1/kernel-headers -endif - LOCAL_PATH := device/google/caimito include device/google/caimito/caiman/uwb/uwb_calibration.mk diff --git a/device-evolution.mk b/device-evolution.mk new file mode 100644 index 00000000..f22b729f --- /dev/null +++ b/device-evolution.mk @@ -0,0 +1,8 @@ +# +# SPDX-FileCopyrightText: 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-komodo.mk b/device-komodo.mk index 2438853f..3220a7b5 100644 --- a/device-komodo.mk +++ b/device-komodo.mk @@ -32,19 +32,13 @@ else TARGET_LINUX_KERNEL_VERSION ?= 6.1 endif -ifdef RELEASE_KERNEL_KOMODO_DIR -TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_KOMODO_DIR) -TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_KOMODO_DIR)/kernel-headers +TARGET_KERNEL_DIR := device/google/caimito-kernels/evolution +TARGET_BOARD_KERNEL_HEADERS := $(TARGET_KERNEL_DIR)/kernel-headers ifneq ($(TARGET_BOOTS_16K),true) PRODUCT_16K_DEVELOPER_OPTION := $(RELEASE_GOOGLE_KOMODO_16K_DEVELOPER_OPTION) endif -else -TARGET_KERNEL_DIR ?= device/google/caimito-kernels/6.1/24D1 -TARGET_BOARD_KERNEL_HEADERS ?= device/google/caimito-kernels/6.1/24D1/kernel-headers -endif - LOCAL_PATH := device/google/caimito include device/google/caimito/komodo/uwb/uwb_calibration.mk diff --git a/device-tokay.mk b/device-tokay.mk index e9545c65..e6bffedb 100644 --- a/device-tokay.mk +++ b/device-tokay.mk @@ -32,19 +32,13 @@ else TARGET_LINUX_KERNEL_VERSION ?= 6.1 endif -ifdef RELEASE_KERNEL_TOKAY_DIR -TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_TOKAY_DIR) -TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_TOKAY_DIR)/kernel-headers +TARGET_KERNEL_DIR := device/google/caimito-kernels/evolution +TARGET_BOARD_KERNEL_HEADERS := $(TARGET_KERNEL_DIR)/kernel-headers ifneq ($(TARGET_BOOTS_16K),true) PRODUCT_16K_DEVELOPER_OPTION := $(RELEASE_GOOGLE_TOKAY_16K_DEVELOPER_OPTION) endif -else -TARGET_KERNEL_DIR ?= device/google/caimito-kernels/6.1/24D1 -TARGET_BOARD_KERNEL_HEADERS ?= device/google/caimito-kernels/6.1/24D1/kernel-headers -endif - # display DEVICE_PACKAGE_OVERLAYS += device/google/caimito/tokay/overlay diff --git a/evolution.dependencies b/evolution.dependencies new file mode 100644 index 00000000..9dabc30f --- /dev/null +++ b/evolution.dependencies @@ -0,0 +1,22 @@ +[ + { + "repository": "device_google_zumapro", + "target_path": "device/google/zumapro" + }, + { + "repository": "device_google_caimito-kernels_evolution", + "target_path": "device/google/caimito-kernels/evolution" + }, + { + "repository": "vendor_google_tokay", + "target_path": "vendor/google/tokay" + }, + { + "repository": "vendor_google_caiman", + "target_path": "vendor/google/caiman" + }, + { + "repository": "vendor_google_komodo", + "target_path": "vendor/google/komodo" + } +] diff --git a/komodo/BoardConfig.mk b/komodo/BoardConfig.mk index 1f81f550..3d5d9ff1 100644 --- a/komodo/BoardConfig.mk +++ b/komodo/BoardConfig.mk @@ -34,3 +34,4 @@ include device/google/caimito/wifi/BoardConfig-wifi.mk DEVICE_PATH := device/google/caimito VENDOR_PATH := vendor/google/komodo include $(DEVICE_PATH)/$(TARGET_BOOTLOADER_BOARD_NAME)/BoardConfigLineage.mk +include $(DEVICE_PATH)/$(TARGET_BOOTLOADER_BOARD_NAME)/BoardConfigEvolution.mk diff --git a/komodo/BoardConfigEvolution.mk b/komodo/BoardConfigEvolution.mk new file mode 100644 index 00000000..87b71afb --- /dev/null +++ b/komodo/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/komodo/device-evolution.mk b/komodo/device-evolution.mk new file mode 100644 index 00000000..60656709 --- /dev/null +++ b/komodo/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/komodo/overlay-evolution/packages/apps/Settings/res/values/evolution_strings.xml b/komodo/overlay-evolution/packages/apps/Settings/res/values/evolution_strings.xml new file mode 100644 index 00000000..687d2317 --- /dev/null +++ b/komodo/overlay-evolution/packages/apps/Settings/res/values/evolution_strings.xml @@ -0,0 +1,12 @@ + + + + + + + Oscar Mariscal + https://PayPal.me/osmjr1019 + diff --git a/komodo/proprietary-files.txt b/komodo/proprietary-files.txt index 7af588c9..3d36a172 100644 --- a/komodo/proprietary-files.txt +++ b/komodo/proprietary-files.txt @@ -17,6 +17,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 @@ -44,7 +47,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 @@ -160,7 +163,7 @@ system_ext/etc/sysconfig/sysconfig_com.google.pixel.iwlan.xml system_ext/priv-app/PixelIwlan/PixelIwlan.apk # 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 diff --git a/lineage.dependencies b/lineage.dependencies deleted file mode 100644 index c6459355..00000000 --- a/lineage.dependencies +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - "repository": "android_device_google_zumapro", - "target_path": "device/google/zumapro" - }, - { - "repository": "device/google/caimito-kernels/6.1", - "target_path": "device/google/caimito-kernels/6.1", - "remote": "aosp-caimito" - } -] diff --git a/lineage_caiman.mk b/lineage_caiman.mk index 1c6eeec9..a77d5e25 100644 --- a/lineage_caiman.mk +++ b/lineage_caiman.mk @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 # -# Inherit some common stuff +# Inherit some common Evolution X stuff TARGET_DISABLE_EPPE := true $(call inherit-product, vendor/lineage/config/common_full_phone.mk) @@ -14,7 +14,9 @@ DEVICE_PATH := device/google/caimito VENDOR_PATH := vendor/google/caiman $(call inherit-product, $(DEVICE_PATH)/aosp_$(DEVICE_CODENAME).mk) $(call inherit-product, device/google/zumapro/lineage_common.mk) +$(call inherit-product, device/google/zumapro/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/lineage_komodo.mk b/lineage_komodo.mk index a457e801..6e77a95d 100644 --- a/lineage_komodo.mk +++ b/lineage_komodo.mk @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 # -# Inherit some common stuff +# Inherit some common Evolution X stuff TARGET_DISABLE_EPPE := true $(call inherit-product, vendor/lineage/config/common_full_phone.mk) @@ -14,7 +14,9 @@ DEVICE_PATH := device/google/caimito VENDOR_PATH := vendor/google/komodo $(call inherit-product, $(DEVICE_PATH)/aosp_$(DEVICE_CODENAME).mk) $(call inherit-product, device/google/zumapro/lineage_common.mk) +$(call inherit-product, device/google/zumapro/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/lineage_tokay.mk b/lineage_tokay.mk index e319b64d..831f20b9 100644 --- a/lineage_tokay.mk +++ b/lineage_tokay.mk @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 # -# Inherit some common stuff +# Inherit some common Evolution X stuff TARGET_DISABLE_EPPE := true $(call inherit-product, vendor/lineage/config/common_full_phone.mk) @@ -14,7 +14,9 @@ DEVICE_PATH := device/google/caimito VENDOR_PATH := vendor/google/tokay $(call inherit-product, $(DEVICE_PATH)/aosp_$(DEVICE_CODENAME).mk) $(call inherit-product, device/google/zumapro/lineage_common.mk) +$(call inherit-product, device/google/zumapro/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/tokay/BoardConfig.mk b/tokay/BoardConfig.mk index b2987198..acee44a8 100644 --- a/tokay/BoardConfig.mk +++ b/tokay/BoardConfig.mk @@ -40,3 +40,4 @@ include device/google/caimito/wifi/BoardConfig-wifi.mk DEVICE_PATH := device/google/caimito VENDOR_PATH := vendor/google/tokay include $(DEVICE_PATH)/$(TARGET_BOOTLOADER_BOARD_NAME)/BoardConfigLineage.mk +include $(DEVICE_PATH)/$(TARGET_BOOTLOADER_BOARD_NAME)/BoardConfigEvolution.mk diff --git a/tokay/BoardConfigEvolution.mk b/tokay/BoardConfigEvolution.mk new file mode 100644 index 00000000..87b71afb --- /dev/null +++ b/tokay/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/tokay/device-evolution.mk b/tokay/device-evolution.mk new file mode 100644 index 00000000..60656709 --- /dev/null +++ b/tokay/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/tokay/overlay-evolution/packages/apps/Settings/res/values/evolution_strings.xml b/tokay/overlay-evolution/packages/apps/Settings/res/values/evolution_strings.xml new file mode 100644 index 00000000..c294ac15 --- /dev/null +++ b/tokay/overlay-evolution/packages/apps/Settings/res/values/evolution_strings.xml @@ -0,0 +1,12 @@ + + + + + + + Manidweep + https://www.paypal.me/manidreddy1 + diff --git a/tokay/proprietary-files.txt b/tokay/proprietary-files.txt index 640617de..c4e801c9 100644 --- a/tokay/proprietary-files.txt +++ b/tokay/proprietary-files.txt @@ -17,6 +17,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 @@ -44,7 +47,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 @@ -156,7 +159,7 @@ system_ext/etc/sysconfig/sysconfig_com.google.pixel.iwlan.xml system_ext/priv-app/PixelIwlan/PixelIwlan.apk # 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