diff --git a/oriole/BoardConfig.mk b/oriole/BoardConfig.mk index 1cfc4a3..71a6529 100644 --- a/oriole/BoardConfig.mk +++ b/oriole/BoardConfig.mk @@ -26,8 +26,8 @@ include device/google/raviole/sepolicy/oriole-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/oriole/Android.bp b/oriole/recovery/Android.bp similarity index 77% rename from oriole/Android.bp rename to oriole/recovery/Android.bp index ccb392a..bd2742f 100644 --- a/oriole/Android.bp +++ b/oriole/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/oriole/init.recovery.touch.rc b/oriole/recovery/init.recovery.touch.rc similarity index 100% rename from oriole/init.recovery.touch.rc rename to oriole/recovery/init.recovery.touch.rc diff --git a/raven/BoardConfig.mk b/raven/BoardConfig.mk index 9d46603..abffc8c 100644 --- a/raven/BoardConfig.mk +++ b/raven/BoardConfig.mk @@ -26,8 +26,8 @@ include device/google/raviole/sepolicy/raven-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/raven/Android.bp b/raven/recovery/Android.bp similarity index 77% rename from raven/Android.bp rename to raven/recovery/Android.bp index 1845c51..fb8b271 100644 --- a/raven/Android.bp +++ b/raven/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/raven/init.recovery.touch.rc b/raven/recovery/init.recovery.touch.rc similarity index 100% rename from raven/init.recovery.touch.rc rename to raven/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