diff --git a/resource-overlay/Android.mk b/resource-overlay/Android.mk
deleted file mode 100644
index 5053e7d..0000000
--- a/resource-overlay/Android.mk
+++ /dev/null
@@ -1 +0,0 @@
-include $(call all-subdir-makefiles)
diff --git a/resource-overlay/common/Android.mk b/resource-overlay/common/Android.mk
deleted file mode 100644
index 5053e7d..0000000
--- a/resource-overlay/common/Android.mk
+++ /dev/null
@@ -1 +0,0 @@
-include $(call all-subdir-makefiles)
diff --git a/resource-overlay/common/CarrierConfig/Android.bp b/resource-overlay/common/CarrierConfig/Android.bp
new file mode 100644
index 0000000..df1a2c2
--- /dev/null
+++ b/resource-overlay/common/CarrierConfig/Android.bp
@@ -0,0 +1,10 @@
+//
+// SPDX-FileCopyrightText: 2024-2025 The LineageOS Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+runtime_resource_overlay {
+    name: "CarrierConfigResCommon_Sys",
+    aaptflags: ["--keep-raw-values"],
+    product_specific: true,
+}
diff --git a/resource-overlay/common/CarrierConfig/Android.mk b/resource-overlay/common/CarrierConfig/Android.mk
deleted file mode 100644
index 110f2a4..0000000
--- a/resource-overlay/common/CarrierConfig/Android.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PRODUCT_MODULE := true
-LOCAL_CERTIFICATE := platform
-
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-LOCAL_PACKAGE_NAME := CarrierConfigResCommon_Sys
-
-LOCAL_SDK_VERSION := current
-
-LOCAL_AAPT_FLAGS := --keep-raw-values
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/resource-overlay/common/Frameworks/Android.bp b/resource-overlay/common/Frameworks/Android.bp
new file mode 100644
index 0000000..56c30aa
--- /dev/null
+++ b/resource-overlay/common/Frameworks/Android.bp
@@ -0,0 +1,9 @@
+//
+// SPDX-FileCopyrightText: 2024-2025 The LineageOS Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+runtime_resource_overlay {
+    name: "FrameworksResCommon_Sys",
+    product_specific: true,
+}
diff --git a/resource-overlay/common/Frameworks/Android.mk b/resource-overlay/common/Frameworks/Android.mk
deleted file mode 100644
index b9d6646..0000000
--- a/resource-overlay/common/Frameworks/Android.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PRODUCT_MODULE := true
-LOCAL_CERTIFICATE := platform
-
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-LOCAL_PACKAGE_NAME := FrameworksResCommon_Sys
-LOCAL_SDK_VERSION := current
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/resource-overlay/common/SystemUI/Android.bp b/resource-overlay/common/SystemUI/Android.bp
new file mode 100644
index 0000000..412628c
--- /dev/null
+++ b/resource-overlay/common/SystemUI/Android.bp
@@ -0,0 +1,9 @@
+//
+// SPDX-FileCopyrightText: 2024-2025 The LineageOS Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+runtime_resource_overlay {
+    name: "SystemUIResCommon_Sys",
+    product_specific: true,
+}
diff --git a/resource-overlay/common/SystemUI/Android.mk b/resource-overlay/common/SystemUI/Android.mk
deleted file mode 100644
index b40fbe9..0000000
--- a/resource-overlay/common/SystemUI/Android.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PRODUCT_MODULE := true
-LOCAL_CERTIFICATE := platform
-
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-LOCAL_PACKAGE_NAME := SystemUIResCommon_Sys
-LOCAL_SDK_VERSION := current
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/resource-overlay/common/Telecomm/Android.bp b/resource-overlay/common/Telecomm/Android.bp
new file mode 100644
index 0000000..f5cb999
--- /dev/null
+++ b/resource-overlay/common/Telecomm/Android.bp
@@ -0,0 +1,9 @@
+//
+// SPDX-FileCopyrightText: 2024-2025 The LineageOS Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+runtime_resource_overlay {
+    name: "TelecommResCommon_Sys",
+    product_specific: true,
+}
diff --git a/resource-overlay/common/Telecomm/Android.mk b/resource-overlay/common/Telecomm/Android.mk
deleted file mode 100644
index 9858458..0000000
--- a/resource-overlay/common/Telecomm/Android.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-ifeq ($(TARGET_FWK_SUPPORTS_FULL_VALUEADDS), true)
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PRODUCT_MODULE := true
-LOCAL_CERTIFICATE := platform
-
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-LOCAL_PACKAGE_NAME := TelecommResCommon_Sys
-LOCAL_SDK_VERSION := current
-
-include $(BUILD_RRO_PACKAGE)
-endif
diff --git a/resource-overlay/common/Telephony/Android.bp b/resource-overlay/common/Telephony/Android.bp
new file mode 100644
index 0000000..9a14af6
--- /dev/null
+++ b/resource-overlay/common/Telephony/Android.bp
@@ -0,0 +1,9 @@
+//
+// SPDX-FileCopyrightText: 2024-2025 The LineageOS Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+runtime_resource_overlay {
+    name: "TelephonyResCommon_Sys",
+    product_specific: true,
+}
diff --git a/resource-overlay/common/Telephony/Android.mk b/resource-overlay/common/Telephony/Android.mk
deleted file mode 100644
index 232f580..0000000
--- a/resource-overlay/common/Telephony/Android.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PRODUCT_MODULE := true
-LOCAL_CERTIFICATE := platform
-
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-LOCAL_PACKAGE_NAME := TelephonyResCommon_Sys
-LOCAL_SDK_VERSION := current
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/resource-overlay/common/Wifi/Android.bp b/resource-overlay/common/Wifi/Android.bp
new file mode 100644
index 0000000..8132a05
--- /dev/null
+++ b/resource-overlay/common/Wifi/Android.bp
@@ -0,0 +1,9 @@
+//
+// SPDX-FileCopyrightText: 2024-2025 The LineageOS Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+runtime_resource_overlay {
+    name: "WifiResCommon_Sys",
+    product_specific: true,
+}
diff --git a/resource-overlay/common/Wifi/Android.mk b/resource-overlay/common/Wifi/Android.mk
deleted file mode 100644
index 3bff4e6..0000000
--- a/resource-overlay/common/Wifi/Android.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PRODUCT_MODULE := true
-LOCAL_CERTIFICATE := platform
-
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-LOCAL_PACKAGE_NAME := WifiResCommon_Sys
-LOCAL_SDK_VERSION := current
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/resource-overlay/lahaina/Android.mk b/resource-overlay/lahaina/Android.mk
deleted file mode 100644
index 5053e7d..0000000
--- a/resource-overlay/lahaina/Android.mk
+++ /dev/null
@@ -1 +0,0 @@
-include $(call all-subdir-makefiles)
diff --git a/resource-overlay/lahaina/Frameworks/Android.bp b/resource-overlay/lahaina/Frameworks/Android.bp
new file mode 100644
index 0000000..0e0b40d
--- /dev/null
+++ b/resource-overlay/lahaina/Frameworks/Android.bp
@@ -0,0 +1,9 @@
+//
+// SPDX-FileCopyrightText: 2024-2025 The LineageOS Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+runtime_resource_overlay {
+    name: "FrameworksResTarget",
+    vendor: true,
+}
diff --git a/resource-overlay/lahaina/Frameworks/Android.mk b/resource-overlay/lahaina/Frameworks/Android.mk
deleted file mode 100644
index b5d09b0..0000000
--- a/resource-overlay/lahaina/Frameworks/Android.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_VENDOR_MODULE := true
-LOCAL_CERTIFICATE := platform
-
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-LOCAL_PACKAGE_NAME := FrameworksResTarget
-LOCAL_SDK_VERSION := current
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/resource-overlay/lahaina/Wifi/Android.bp b/resource-overlay/lahaina/Wifi/Android.bp
new file mode 100644
index 0000000..80f6d42
--- /dev/null
+++ b/resource-overlay/lahaina/Wifi/Android.bp
@@ -0,0 +1,9 @@
+//
+// SPDX-FileCopyrightText: 2024-2025 The LineageOS Project
+// SPDX-License-Identifier: Apache-2.0
+//
+
+runtime_resource_overlay {
+    name: "WifiResTarget",
+    vendor: true,
+}
diff --git a/resource-overlay/lahaina/Wifi/Android.mk b/resource-overlay/lahaina/Wifi/Android.mk
deleted file mode 100644
index b1fe113..0000000
--- a/resource-overlay/lahaina/Wifi/Android.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_VENDOR_MODULE := true
-LOCAL_CERTIFICATE := platform
-
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-LOCAL_PACKAGE_NAME := WifiResTarget
-LOCAL_SDK_VERSION := current
-
-include $(BUILD_RRO_PACKAGE)