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..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/device-tangorpro.mk b/device-tangorpro.mk index 9579eab..f1c9487 100644 --- a/device-tangorpro.mk +++ b/device-tangorpro.mk @@ -18,9 +18,8 @@ TARGET_RECOVERY_DEFAULT_ROTATION := ROTATION_LEFT TARGET_RECOVERY_DEFAULT_TOUCH_ROTATION := $(TARGET_RECOVERY_DEFAULT_ROTATION) TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_TANGORPRO_VERSION) -# Keeps flexibility for kasan and ufs builds -TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_TANGORPRO_DIR) -TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_TANGORPRO_DIR)/kernel-headers +TARGET_KERNEL_DIR := device/google/tangorpro-kernels/evolution +TARGET_BOARD_KERNEL_HEADERS := $(TARGET_KERNEL_DIR)/kernel-headers BOARD_WITHOUT_RADIO := true @@ -76,14 +75,6 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/google/tangorpro/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.tangorpro.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/tangorpro/init.insmod.tangorpro.cfg:$(TARGET_COPY_OUT_VENDOR_DLKM)/etc/init.insmod.tangorpro.cfg -endif - # Camera PRODUCT_COPY_FILES += \ device/google/tangorpro/media_profiles_tangorpro.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..6559bde --- /dev/null +++ b/evolution.dependencies @@ -0,0 +1,14 @@ +[ + { + "repository": "device_google_gs201", + "target_path": "device/google/gs201" + }, + { + "repository": "device_google_tangorpro-kernels_evolution", + "target_path": "device/google/tangorpro-kernels/evolution" + }, + { + "repository": "vendor_google_tangorpro", + "target_path": "vendor/google/tangorpro" + } +] diff --git a/init.insmod.tangorpro.cfg b/init.insmod.tangorpro.cfg deleted file mode 100644 index 062e2c8..0000000 --- a/init.insmod.tangorpro.cfg +++ /dev/null @@ -1,16 +0,0 @@ -########################################################## -# init.insmod.tangorpro.cfg # -# This file contains tangorpro 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|synadhd.ko -modprobe|snd-soc-cs35l41-spi.ko -modprobe|nvt_touch.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 f377178..0000000 --- a/lineage.dependencies +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - "repository": "android_device_google_gs201", - "target_path": "device/google/gs201" - }, - { - "repository": "device/google/tangorpro-kernels/6.1", - "target_path": "device/google/tangorpro-kernels/6.1", - "remote": "aosp-tangorpro" - } -] diff --git a/lineage_tangorpro.mk b/lineage_tangorpro.mk index 168b75c..29a899d 100644 --- a/lineage_tangorpro.mk +++ b/lineage_tangorpro.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_tablet_wifionly.mk) @@ -14,7 +14,9 @@ DEVICE_PATH := device/google/tangorpro VENDOR_PATH := vendor/google/tangorpro $(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/tangorpro/BoardConfigEvolution.mk b/tangorpro/BoardConfigEvolution.mk new file mode 100644 index 0000000..87b71af --- /dev/null +++ b/tangorpro/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/tangorpro/device-evolution.mk b/tangorpro/device-evolution.mk new file mode 100644 index 0000000..6065670 --- /dev/null +++ b/tangorpro/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/tangorpro/overlay-evolution/packages/apps/Settings/res/values/evolution_strings.xml b/tangorpro/overlay-evolution/packages/apps/Settings/res/values/evolution_strings.xml new file mode 100644 index 0000000..8d8d1db --- /dev/null +++ b/tangorpro/overlay-evolution/packages/apps/Settings/res/values/evolution_strings.xml @@ -0,0 +1,12 @@ + + + + + + + Anierin Bliss + https://PayPal.me/AnierinB + diff --git a/tangorpro/proprietary-files.txt b/tangorpro/proprietary-files.txt index 92de375..3561761 100644 --- a/tangorpro/proprietary-files.txt +++ b/tangorpro/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 @@ -53,7 +56,7 @@ product/etc/permissions/com.google.assistant.hubui.xml product/priv-app/SmartDisplayPrebuilt/SmartDisplayPrebuilt.apk;PRESIGNED # 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/kids_home_experience.xml @@ -108,7 +111,7 @@ system_ext/etc/permissions/com.android.hotwordenrollment.common.util.xml system_ext/framework/com.android.hotwordenrollment.common.util.jar # 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/permissions/google-ril.xml