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/bluejay/BoardConfig.mk b/bluejay/BoardConfig.mk index a311a29..7a9fb6d 100644 --- a/bluejay/BoardConfig.mk +++ b/bluejay/BoardConfig.mk @@ -49,3 +49,4 @@ $(call soong_config_set,google3a_config,target_device,bluejay) DEVICE_PATH := device/google/bluejay VENDOR_PATH := vendor/google/bluejay include $(DEVICE_PATH)/$(TARGET_BOOTLOADER_BOARD_NAME)/BoardConfigLineage.mk +include $(DEVICE_PATH)/$(TARGET_BOOTLOADER_BOARD_NAME)/BoardConfigEvolution.mk diff --git a/bluejay/BoardConfigEvolution.mk b/bluejay/BoardConfigEvolution.mk new file mode 100644 index 0000000..87b71af --- /dev/null +++ b/bluejay/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/bluejay/device-evolution.mk b/bluejay/device-evolution.mk new file mode 100644 index 0000000..6065670 --- /dev/null +++ b/bluejay/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/bluejay/overlay-evolution/packages/apps/Settings/res/values/evolution_strings.xml b/bluejay/overlay-evolution/packages/apps/Settings/res/values/evolution_strings.xml new file mode 100644 index 0000000..8d8d1db --- /dev/null +++ b/bluejay/overlay-evolution/packages/apps/Settings/res/values/evolution_strings.xml @@ -0,0 +1,12 @@ + + + + + + + Anierin Bliss + https://PayPal.me/AnierinB + diff --git a/bluejay/proprietary-files.txt b/bluejay/proprietary-files.txt index ac6ccf6..b2262c1 100644 --- a/bluejay/proprietary-files.txt +++ b/bluejay/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/ShannonQualifiedNetworksService/ShannonQualifiedNetworksServ 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 diff --git a/device-bluejay.mk b/device-bluejay.mk index 1856047..f81f01f 100644 --- a/device-bluejay.mk +++ b/device-bluejay.mk @@ -15,9 +15,8 @@ # TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_BLUEJAY_VERSION) -# Keeps flexibility for kasan and ufs builds -TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_BLUEJAY_DIR) -TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_BLUEJAY_DIR)/kernel-headers +TARGET_KERNEL_DIR := device/google/bluejay-kernels/evolution +TARGET_BOARD_KERNEL_HEADERS := $(TARGET_KERNEL_DIR)/kernel-headers DEVICE_PACKAGE_OVERLAYS += device/google/bluejay/bluejay/overlay @@ -41,14 +40,6 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/google/gs101/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.bluejay.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/bluejay/init.insmod.bluejay.cfg:$(TARGET_COPY_OUT_VENDOR_DLKM)/etc/init.insmod.bluejay.cfg -endif - # Thermal Config PRODUCT_COPY_FILES += \ device/google/bluejay/thermal_info_config_bluejay.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config.json \ 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..ceeb307 --- /dev/null +++ b/evolution.dependencies @@ -0,0 +1,14 @@ +[ + { + "repository": "device_google_gs101", + "target_path": "device/google/gs101" + }, + { + "repository": "device_google_bluejay-kernels_evolution", + "target_path": "device/google/bluejay-kernels/evolution" + }, + { + "repository": "vendor_google_bluejay", + "target_path": "vendor/google/bluejay" + } +] diff --git a/init.insmod.bluejay.cfg b/init.insmod.bluejay.cfg deleted file mode 100644 index 26297a5..0000000 --- a/init.insmod.bluejay.cfg +++ /dev/null @@ -1,19 +0,0 @@ -########################################################## -# init.insmod.bluejay.cfg # -# This file contains bluejay 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|bcmdhd4389.ko -modprobe|snd-soc-cs35l41-i2c.ko -modprobe|cs40l26-i2c.ko -modprobe|ftm5.ko -modprobe|sec_touch.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 3334bf0..0000000 --- a/lineage.dependencies +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - "repository": "android_device_google_gs101", - "target_path": "device/google/gs101" - }, - { - "repository": "device/google/bluejay-kernels/6.1", - "target_path": "device/google/bluejay-kernels/6.1", - "remote": "aosp-bluejay" - } -] diff --git a/lineage_bluejay.mk b/lineage_bluejay.mk index 83e061f..6844f6f 100644 --- a/lineage_bluejay.mk +++ b/lineage_bluejay.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/bluejay VENDOR_PATH := vendor/google/bluejay $(call inherit-product, $(DEVICE_PATH)/aosp_$(DEVICE_CODENAME).mk) $(call inherit-product, device/google/gs101/lineage_common.mk) +$(call inherit-product, device/google/gs101/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