From 3480bf0185be710571692123d35c2cee246281b2 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Wed, 26 Nov 2025 00:22:00 +0200 Subject: [PATCH] bluejay: Relocate recovery configuration Change-Id: I743723c35eb0abdad7d0d831de67923a16886ddd --- bluejay/BoardConfig.mk | 4 ++-- {bluejay => recovery}/Android.bp | 2 +- {bluejay => recovery}/init.recovery.touch.rc | 0 .../modules.blocklist.vendor_boot | 0 modules.load.vendor_boot => recovery/modules.load.vendor_boot | 0 5 files changed, 3 insertions(+), 3 deletions(-) rename {bluejay => recovery}/Android.bp (77%) rename {bluejay => recovery}/init.recovery.touch.rc (100%) rename modules.blocklist.vendor_boot => recovery/modules.blocklist.vendor_boot (100%) rename modules.load.vendor_boot => recovery/modules.load.vendor_boot (100%) diff --git a/bluejay/BoardConfig.mk b/bluejay/BoardConfig.mk index 223c23b..78af2f4 100644 --- a/bluejay/BoardConfig.mk +++ b/bluejay/BoardConfig.mk @@ -26,8 +26,8 @@ include device/google/bluejay/sepolicy/bluejay-sepolicy.mk include device/google/gs101/wifi/BoardConfig-wifi.mk # Kernel modules -BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_BLOCKLIST_FILE := $(DEVICE_PATH)/modules.blocklist.vendor_boot -BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD_RAW := $(strip $(shell cat $(DEVICE_PATH)/modules.load.vendor_boot)) +BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_BLOCKLIST_FILE := $(DEVICE_PATH)/recovery/modules.blocklist.vendor_boot +BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD_RAW := $(strip $(shell cat $(DEVICE_PATH)/recovery/modules.load.vendor_boot)) BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD += $(BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD_RAW) BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES += $(addprefix $(KERNEL_MODULE_DIR)/, $(notdir $(BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD_RAW))) diff --git a/bluejay/Android.bp b/recovery/Android.bp similarity index 77% rename from bluejay/Android.bp rename to recovery/Android.bp index c5b7799..2d96e33 100644 --- a/bluejay/Android.bp +++ b/recovery/Android.bp @@ -1,5 +1,5 @@ // -// SPDX-FileCopyrightText: 2024 The LineageOS Project +// SPDX-FileCopyrightText: The LineageOS Project // SPDX-License-Identifier: Apache-2.0 // diff --git a/bluejay/init.recovery.touch.rc b/recovery/init.recovery.touch.rc similarity index 100% rename from bluejay/init.recovery.touch.rc rename to recovery/init.recovery.touch.rc diff --git a/modules.blocklist.vendor_boot b/recovery/modules.blocklist.vendor_boot similarity index 100% rename from modules.blocklist.vendor_boot rename to recovery/modules.blocklist.vendor_boot diff --git a/modules.load.vendor_boot b/recovery/modules.load.vendor_boot similarity index 100% rename from modules.load.vendor_boot rename to recovery/modules.load.vendor_boot