From c7f8dcd43b89f50cbfe32d3c0bba41acbe19ec48 Mon Sep 17 00:00:00 2001 From: AnierinB Date: Sun, 23 Jun 2024 04:14:44 +0000 Subject: [PATCH] akita: Initialize for Evolution X 11.x Signed-off-by: AnierinB --- BoardConfigEvolution.mk | 4 ++++ akita/BoardConfig.mk | 1 + akita/BoardConfigEvolution.mk | 6 ++++++ akita/device-evolution.mk | 8 ++++++++ .../apps/Settings/res/values/evolution_strings.xml | 12 ++++++++++++ akita/proprietary-files.txt | 7 +++++-- device-akita.mk | 5 ++--- device-evolution.mk | 6 ++++++ evolution.dependencies | 14 ++++++++++++++ lineage.dependencies | 11 ----------- lineage_akita.mk | 4 +++- 11 files changed, 61 insertions(+), 17 deletions(-) create mode 100644 BoardConfigEvolution.mk create mode 100644 akita/BoardConfigEvolution.mk create mode 100644 akita/device-evolution.mk create mode 100644 akita/overlay-evolution/packages/apps/Settings/res/values/evolution_strings.xml create mode 100644 device-evolution.mk create mode 100644 evolution.dependencies delete mode 100644 lineage.dependencies 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/akita/BoardConfig.mk b/akita/BoardConfig.mk index 8ceccbe..8b05c2b 100644 --- a/akita/BoardConfig.mk +++ b/akita/BoardConfig.mk @@ -45,3 +45,4 @@ include device/google/akita/wifi/BoardConfig-wifi.mk DEVICE_PATH := device/google/akita VENDOR_PATH := vendor/google/akita include $(DEVICE_PATH)/$(TARGET_BOOTLOADER_BOARD_NAME)/BoardConfigLineage.mk +include $(DEVICE_PATH)/$(TARGET_BOOTLOADER_BOARD_NAME)/BoardConfigEvolution.mk diff --git a/akita/BoardConfigEvolution.mk b/akita/BoardConfigEvolution.mk new file mode 100644 index 0000000..87b71af --- /dev/null +++ b/akita/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/akita/device-evolution.mk b/akita/device-evolution.mk new file mode 100644 index 0000000..6065670 --- /dev/null +++ b/akita/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/akita/overlay-evolution/packages/apps/Settings/res/values/evolution_strings.xml b/akita/overlay-evolution/packages/apps/Settings/res/values/evolution_strings.xml new file mode 100644 index 0000000..687d231 --- /dev/null +++ b/akita/overlay-evolution/packages/apps/Settings/res/values/evolution_strings.xml @@ -0,0 +1,12 @@ + + + + + + + Oscar Mariscal + https://PayPal.me/osmjr1019 + diff --git a/akita/proprietary-files.txt b/akita/proprietary-files.txt index 9f9a708..4b29c94 100644 --- a/akita/proprietary-files.txt +++ b/akita/proprietary-files.txt @@ -14,6 +14,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 @@ -41,7 +44,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 @@ -143,7 +146,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-akita.mk b/device-akita.mk index 7a22d69..de39ec1 100644 --- a/device-akita.mk +++ b/device-akita.mk @@ -15,9 +15,8 @@ # TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_AKITA_VERSION) -# Keeps flexibility for kasan and ufs builds -TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_AKITA_DIR) -TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_AKITA_DIR)/kernel-headers +TARGET_KERNEL_DIR := device/google/akita-kernels/evolution +TARGET_BOARD_KERNEL_HEADERS := $(TARGET_KERNEL_DIR)/kernel-headers ifneq ($(TARGET_BOOTS_16K),true) PRODUCT_16K_DEVELOPER_OPTION := $(RELEASE_GOOGLE_AKITA_16K_DEVELOPER_OPTION) diff --git a/device-evolution.mk b/device-evolution.mk new file mode 100644 index 0000000..5c0a356 --- /dev/null +++ b/device-evolution.mk @@ -0,0 +1,6 @@ +# +# SPDX-FileCopyrightText: 2024 The Evolution X Project +# SPDX-License-Identifier: Apache-2.0 +# + +DEVICE_PACKAGE_OVERLAYS += $(DEVICE_PATH)/overlay-evolution diff --git a/evolution.dependencies b/evolution.dependencies new file mode 100644 index 0000000..2f0e2cc --- /dev/null +++ b/evolution.dependencies @@ -0,0 +1,14 @@ +[ + { + "repository": "device_google_zuma", + "target_path": "device/google/zuma" + }, + { + "repository": "device_google_akita-kernels_evolution", + "target_path": "device/google/akita-kernels/evolution" + }, + { + "repository": "vendor_google_akita", + "target_path": "vendor/google/akita" + } +] diff --git a/lineage.dependencies b/lineage.dependencies deleted file mode 100644 index a44c191..0000000 --- a/lineage.dependencies +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - "repository": "android_device_google_zuma", - "target_path": "device/google/zuma" - }, - { - "repository": "device/google/akita-kernels/6.1", - "target_path": "device/google/akita-kernels/6.1", - "remote": "aosp-akita" - } -] diff --git a/lineage_akita.mk b/lineage_akita.mk index 8195970..9c9efd5 100644 --- a/lineage_akita.mk +++ b/lineage_akita.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/akita VENDOR_PATH := vendor/google/akita $(call inherit-product, $(DEVICE_PATH)/aosp_$(DEVICE_CODENAME).mk) $(call inherit-product, device/google/zuma/lineage_common.mk) +$(call inherit-product, device/google/zuma/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