omni: Convert IconShape and PrimaryColor Android.mk theme overlay to bp
Add delete the unuseed Empty(Product)Overlay and font rro packages too
Change-Id: I953c94cf509f48b426dbe23f4295295b19aa5175
diff --git a/themes/overlays/Android.mk b/themes/overlays/Android.mk
index 5feface..97aa578 100644
--- a/themes/overlays/Android.mk
+++ b/themes/overlays/Android.mk
@@ -24,9 +24,6 @@
AccentColorOrangeOverlay
LOCAL_REQUIRED_MODULES += \
- EmptyProductOverlay
-
-LOCAL_REQUIRED_MODULES += \
IconShapeCircleOverlay \
IconShapeSquareOverlay \
IconShapeSquircleOverlay \
diff --git a/themes/overlays/EmptyOverlay/Android.mk b/themes/overlays/EmptyOverlay/Android.mk
deleted file mode 100644
index cf3ef0c..0000000
--- a/themes/overlays/EmptyOverlay/Android.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Copyright 2018, The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_RRO_THEME := EmptyOverlay
-
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-
-LOCAL_PACKAGE_NAME := EmptyOverlay
-LOCAL_SDK_VERSION := current
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/overlays/EmptyOverlay/AndroidManifest.xml b/themes/overlays/EmptyOverlay/AndroidManifest.xml
deleted file mode 100644
index bb84d3f..0000000
--- a/themes/overlays/EmptyOverlay/AndroidManifest.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="org.omnirom.overlay.empty" platformBuildVersionCode="29" platformBuildVersionName="10">
- <overlay android:isStatic="true" android:priority="999" android:targetPackage="android"/>
- <application android:label="OmniROM Empty Overlay" android:hasCode="false"/>
-</manifest>
diff --git a/themes/overlays/EmptyOverlay/README.txt b/themes/overlays/EmptyOverlay/README.txt
deleted file mode 100644
index 433c261..0000000
--- a/themes/overlays/EmptyOverlay/README.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Empty "fake" static overlay for android
-Can be used to bind mount and hide static overlays from /vendor/overlay
-that a device dont want to see. Using /dev/null breaks idmap2 run
-which also breaks valid static overlays that might be in /product/overlay
-
-Usage:
-Put into init.rc file for every overlay
- mount none /system/overlay/EmptyOverlay/EmptyOverlay.apk /vendor/overlay/FrameworksResCommon.apk bind
-
diff --git a/themes/overlays/EmptyProductOverlay/Android.mk b/themes/overlays/EmptyProductOverlay/Android.mk
deleted file mode 100644
index 6635868..0000000
--- a/themes/overlays/EmptyProductOverlay/Android.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Copyright 2018, The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_RRO_THEME := EmptyProductOverlay
-
-LOCAL_PRODUCT_MODULE := true
-
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-
-LOCAL_PACKAGE_NAME := EmptyProductOverlay
-LOCAL_SDK_VERSION := current
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/overlays/EmptyProductOverlay/AndroidManifest.xml b/themes/overlays/EmptyProductOverlay/AndroidManifest.xml
deleted file mode 100644
index e52d72e..0000000
--- a/themes/overlays/EmptyProductOverlay/AndroidManifest.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="org.omnirom.overlay.product.empty" platformBuildVersionCode="29" platformBuildVersionName="10">
- <overlay android:targetPackage="android"/>
- <application android:label="OmniROM Empty Product Overlay" android:hasCode="false"/>
-</manifest>
diff --git a/themes/overlays/EmptyProductOverlay/README.txt b/themes/overlays/EmptyProductOverlay/README.txt
deleted file mode 100644
index a3342f3..0000000
--- a/themes/overlays/EmptyProductOverlay/README.txt
+++ /dev/null
@@ -1 +0,0 @@
-Empty "fake" product overlay for testing
diff --git a/themes/overlays/FontLatoSourceOverlay/Android.mk b/themes/overlays/FontLatoSourceOverlay/Android.mk
deleted file mode 100644
index 9cde9fc..0000000
--- a/themes/overlays/FontLatoSourceOverlay/Android.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Copyright 2019, The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_RRO_THEME := FontLatoSource
-
-LOCAL_PRODUCT_MODULE := true
-
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-LOCAL_PACKAGE_NAME := FontLatoSourceOverlay
-LOCAL_SDK_VERSION := current
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/overlays/FontLatoSourceOverlay/AndroidManifest.xml b/themes/overlays/FontLatoSourceOverlay/AndroidManifest.xml
deleted file mode 100644
index c2f7d24..0000000
--- a/themes/overlays/FontLatoSourceOverlay/AndroidManifest.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<!--
-/**
- * Copyright (c) 2019, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.theme.font.latosource"
- android:versionCode="1"
- android:versionName="1.0">
- <overlay android:targetPackage="android"
- android:category="android.theme.customization.font"
- android:priority="1"/>
-
- <application android:label="@string/font_lato_source_overlay" android:hasCode="false">
- <meta-data
- android:name="android.theme.customization.REQUIRED_SYSTEM_FONTS"
- android:value="lato,lato-semi-bold,lato-bold" />
- </application>
-</manifest>
diff --git a/themes/overlays/FontLatoSourceOverlay/res/values/config.xml b/themes/overlays/FontLatoSourceOverlay/res/values/config.xml
deleted file mode 100644
index 9ec6a1c..0000000
--- a/themes/overlays/FontLatoSourceOverlay/res/values/config.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--
-/**
- * Copyright (c) 2019, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <!-- Name of a font family to use for body text. -->
- <string name="config_bodyFontFamily" translatable="false">lato</string>
- <!-- Name of a font family to use for medium body text. -->
- <string name="config_bodyFontFamilyMedium" translatable="false">lato-semi-bold</string>
- <!-- Name of a font family to use for headlines. If empty, falls back to platform default -->
- <string name="config_headlineFontFamily" translatable="false">lato-bold</string>
- <!-- Name of the font family used for system surfaces where the font should use medium weight -->
- <string name="config_headlineFontFamilyMedium" translatable="false">lato-semi-bold</string>
-</resources>
-
diff --git a/themes/overlays/FontLatoSourceOverlay/res/values/strings.xml b/themes/overlays/FontLatoSourceOverlay/res/values/strings.xml
deleted file mode 100644
index 3089d24..0000000
--- a/themes/overlays/FontLatoSourceOverlay/res/values/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<!--
-/**
- * Copyright (c) 2019, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <!-- Lato overlay -->
- <string name="font_lato_source_overlay" translatable="false">Lato</string>
-</resources>
diff --git a/themes/overlays/FontMuliSourceOverlay/Android.mk b/themes/overlays/FontMuliSourceOverlay/Android.mk
deleted file mode 100644
index b6162d4..0000000
--- a/themes/overlays/FontMuliSourceOverlay/Android.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Copyright 2019, The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_RRO_THEME := FontMuliSource
-
-LOCAL_PRODUCT_MODULE := true
-
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-LOCAL_PACKAGE_NAME := FontMuliSourceOverlay
-LOCAL_SDK_VERSION := current
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/overlays/FontMuliSourceOverlay/AndroidManifest.xml b/themes/overlays/FontMuliSourceOverlay/AndroidManifest.xml
deleted file mode 100644
index 9fe0de2..0000000
--- a/themes/overlays/FontMuliSourceOverlay/AndroidManifest.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<!--
-/**
- * Copyright (c) 2019, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.theme.font.mulisource"
- android:versionCode="1"
- android:versionName="1.0">
- <overlay android:targetPackage="android"
- android:category="android.theme.customization.font"
- android:priority="1"/>
-
- <application android:label="@string/font_muli_source_overlay" android:hasCode="false">
- <meta-data
- android:name="android.theme.customization.REQUIRED_SYSTEM_FONTS"
- android:value="muli,muli-semi-bold,muli-bold" />
- </application>
-</manifest>
diff --git a/themes/overlays/FontMuliSourceOverlay/res/values/config.xml b/themes/overlays/FontMuliSourceOverlay/res/values/config.xml
deleted file mode 100644
index 75a86dd..0000000
--- a/themes/overlays/FontMuliSourceOverlay/res/values/config.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--
-/**
- * Copyright (c) 2019, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <!-- Name of a font family to use for body text. -->
- <string name="config_bodyFontFamily" translatable="false">muli</string>
- <!-- Name of a font family to use for medium body text. -->
- <string name="config_bodyFontFamilyMedium" translatable="false">muli-semi-bold</string>
- <!-- Name of a font family to use for headlines. If empty, falls back to platform default -->
- <string name="config_headlineFontFamily" translatable="false">muli-semi-bold</string>
- <!-- Name of the font family used for system surfaces where the font should use medium weight -->
- <string name="config_headlineFontFamilyMedium" translatable="false">muli-bold</string>
-</resources>
-
diff --git a/themes/overlays/FontMuliSourceOverlay/res/values/strings.xml b/themes/overlays/FontMuliSourceOverlay/res/values/strings.xml
deleted file mode 100644
index de6ba15..0000000
--- a/themes/overlays/FontMuliSourceOverlay/res/values/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<!--
-/**
- * Copyright (c) 2019, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <!-- Lato overlay -->
- <string name="font_muli_source_overlay" translatable="false">Muli</string>
-</resources>
diff --git a/themes/overlays/IconShapeCircleOverlay/Android.bp b/themes/overlays/IconShapeCircleOverlay/Android.bp
new file mode 100644
index 0000000..58246b0
--- /dev/null
+++ b/themes/overlays/IconShapeCircleOverlay/Android.bp
@@ -0,0 +1,11 @@
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+runtime_resource_overlay {
+ name: "IconShapeCircleOverlay",
+ theme: "IconShapeCircleOverlay",
+ sdk_version: "current",
+ product_specific: true,
+ resource_dirs: ["res"],
+}
diff --git a/themes/overlays/IconShapeCircleOverlay/Android.mk b/themes/overlays/IconShapeCircleOverlay/Android.mk
deleted file mode 100644
index 8bf40c0..0000000
--- a/themes/overlays/IconShapeCircleOverlay/Android.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Copyright 2018, The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_RRO_THEME := IconShapeCircle
-
-LOCAL_PRODUCT_MODULE := true
-
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-LOCAL_PACKAGE_NAME := IconShapeCircleOverlay
-LOCAL_SDK_VERSION := current
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/overlays/IconShapePebbleOverlay/Android.bp b/themes/overlays/IconShapePebbleOverlay/Android.bp
new file mode 100644
index 0000000..b336850
--- /dev/null
+++ b/themes/overlays/IconShapePebbleOverlay/Android.bp
@@ -0,0 +1,11 @@
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+runtime_resource_overlay {
+ name: "IconShapePebbleOverlay",
+ theme: "IconShapePebbleOverlay",
+ sdk_version: "current",
+ product_specific: true,
+ resource_dirs: ["res"],
+}
diff --git a/themes/overlays/IconShapePebbleOverlay/Android.mk b/themes/overlays/IconShapePebbleOverlay/Android.mk
deleted file mode 100644
index c163bb9..0000000
--- a/themes/overlays/IconShapePebbleOverlay/Android.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Copyright 2020, The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_RRO_THEME := IconShapePebble
-
-LOCAL_PRODUCT_MODULE := true
-
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-LOCAL_PACKAGE_NAME := IconShapePebbleOverlay
-LOCAL_SDK_VERSION := current
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/overlays/IconShapeRoundedRectOverlay/Android.bp b/themes/overlays/IconShapeRoundedRectOverlay/Android.bp
new file mode 100644
index 0000000..5d65d49
--- /dev/null
+++ b/themes/overlays/IconShapeRoundedRectOverlay/Android.bp
@@ -0,0 +1,11 @@
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+runtime_resource_overlay {
+ name: "IconShapeRoundedRectOverlay",
+ theme: "IconShapeRoundedRectOverlay",
+ sdk_version: "current",
+ product_specific: true,
+ resource_dirs: ["res"],
+}
diff --git a/themes/overlays/IconShapeRoundedRectOverlay/Android.mk b/themes/overlays/IconShapeRoundedRectOverlay/Android.mk
deleted file mode 100644
index c6f00d1..0000000
--- a/themes/overlays/IconShapeRoundedRectOverlay/Android.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Copyright 2018, The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_RRO_THEME := IconShapeRoundedRect
-
-LOCAL_PRODUCT_MODULE := true
-
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-LOCAL_PACKAGE_NAME := IconShapeRoundedRectOverlay
-LOCAL_SDK_VERSION := current
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/overlays/IconShapeSquareOverlay/Android.bp b/themes/overlays/IconShapeSquareOverlay/Android.bp
new file mode 100644
index 0000000..c45855c
--- /dev/null
+++ b/themes/overlays/IconShapeSquareOverlay/Android.bp
@@ -0,0 +1,11 @@
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+runtime_resource_overlay {
+ name: "IconShapeSquareOverlay",
+ theme: "IconShapeSquareOverlay",
+ sdk_version: "current",
+ product_specific: true,
+ resource_dirs: ["res"],
+}
diff --git a/themes/overlays/IconShapeSquareOverlay/Android.mk b/themes/overlays/IconShapeSquareOverlay/Android.mk
deleted file mode 100644
index 6020721..0000000
--- a/themes/overlays/IconShapeSquareOverlay/Android.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Copyright 2018, The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_RRO_THEME := IconShapeSquare
-
-LOCAL_PRODUCT_MODULE := true
-
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-LOCAL_PACKAGE_NAME := IconShapeSquareOverlay
-LOCAL_SDK_VERSION := current
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/overlays/IconShapeSquircleOverlay/Android.bp b/themes/overlays/IconShapeSquircleOverlay/Android.bp
new file mode 100644
index 0000000..f62679e
--- /dev/null
+++ b/themes/overlays/IconShapeSquircleOverlay/Android.bp
@@ -0,0 +1,11 @@
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+runtime_resource_overlay {
+ name: "IconShapeSquircleOverlay",
+ theme: "IconShapeSquircleOverlay",
+ sdk_version: "current",
+ product_specific: true,
+ resource_dirs: ["res"],
+}
diff --git a/themes/overlays/IconShapeSquircleOverlay/Android.mk b/themes/overlays/IconShapeSquircleOverlay/Android.mk
deleted file mode 100644
index 04409a5..0000000
--- a/themes/overlays/IconShapeSquircleOverlay/Android.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Copyright 2018, The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_RRO_THEME := IconShapeSquircle
-
-LOCAL_PRODUCT_MODULE := true
-
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-LOCAL_PACKAGE_NAME := IconShapeSquircleOverlay
-LOCAL_SDK_VERSION := current
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/overlays/IconShapeTeardropOverlay/Android.bp b/themes/overlays/IconShapeTeardropOverlay/Android.bp
new file mode 100644
index 0000000..83f8850
--- /dev/null
+++ b/themes/overlays/IconShapeTeardropOverlay/Android.bp
@@ -0,0 +1,11 @@
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+runtime_resource_overlay {
+ name: "IconShapeTeardropOverlay",
+ theme: "IconShapeTeardropOverlay",
+ sdk_version: "current",
+ product_specific: true,
+ resource_dirs: ["res"],
+}
diff --git a/themes/overlays/IconShapeTeardropOverlay/Android.mk b/themes/overlays/IconShapeTeardropOverlay/Android.mk
deleted file mode 100644
index b127dea..0000000
--- a/themes/overlays/IconShapeTeardropOverlay/Android.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Copyright 2018, The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_RRO_THEME := IconShapeTeardrop
-
-LOCAL_PRODUCT_MODULE := true
-
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-LOCAL_PACKAGE_NAME := IconShapeTeardropOverlay
-LOCAL_SDK_VERSION := current
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/overlays/PrimaryColorDarkBlue/Android.mk b/themes/overlays/PrimaryColorDarkBlue/Android.mk
deleted file mode 100644
index 5816447..0000000
--- a/themes/overlays/PrimaryColorDarkBlue/Android.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Copyright 2018, The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_RRO_THEME := PrimaryColorDarkBlue
-
-LOCAL_PRODUCT_MODULE := true
-
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-LOCAL_PACKAGE_NAME := PrimaryColorDarkBlueOverlay
-LOCAL_SDK_VERSION := current
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/overlays/PrimaryColorDarkBlueOverlay/Android.bp b/themes/overlays/PrimaryColorDarkBlueOverlay/Android.bp
new file mode 100644
index 0000000..947a782
--- /dev/null
+++ b/themes/overlays/PrimaryColorDarkBlueOverlay/Android.bp
@@ -0,0 +1,11 @@
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+runtime_resource_overlay {
+ name: "PrimaryColorDarkBlueOverlay",
+ theme: "PrimaryColorDarkBlueOverlay",
+ sdk_version: "current",
+ product_specific: true,
+ resource_dirs: ["res"],
+}
diff --git a/themes/overlays/PrimaryColorDarkBlue/AndroidManifest.xml b/themes/overlays/PrimaryColorDarkBlueOverlay/AndroidManifest.xml
similarity index 100%
rename from themes/overlays/PrimaryColorDarkBlue/AndroidManifest.xml
rename to themes/overlays/PrimaryColorDarkBlueOverlay/AndroidManifest.xml
diff --git a/themes/overlays/PrimaryColorDarkBlue/res/values/colors.xml b/themes/overlays/PrimaryColorDarkBlueOverlay/res/values/colors.xml
similarity index 100%
rename from themes/overlays/PrimaryColorDarkBlue/res/values/colors.xml
rename to themes/overlays/PrimaryColorDarkBlueOverlay/res/values/colors.xml
diff --git a/themes/overlays/PrimaryColorDarkBlue/res/values/strings.xml b/themes/overlays/PrimaryColorDarkBlueOverlay/res/values/strings.xml
similarity index 100%
rename from themes/overlays/PrimaryColorDarkBlue/res/values/strings.xml
rename to themes/overlays/PrimaryColorDarkBlueOverlay/res/values/strings.xml
diff --git a/themes/overlays/PrimaryColorDarkGray/Android.mk b/themes/overlays/PrimaryColorDarkGray/Android.mk
deleted file mode 100644
index 6fa7ecc..0000000
--- a/themes/overlays/PrimaryColorDarkGray/Android.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Copyright 2018, The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_RRO_THEME := PrimaryColorDarkGray
-
-LOCAL_PRODUCT_MODULE := true
-
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-LOCAL_PACKAGE_NAME := PrimaryColorDarkGrayOverlay
-LOCAL_SDK_VERSION := current
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/themes/overlays/PrimaryColorDarkGrayOverlay/Android.bp b/themes/overlays/PrimaryColorDarkGrayOverlay/Android.bp
new file mode 100644
index 0000000..8f91891
--- /dev/null
+++ b/themes/overlays/PrimaryColorDarkGrayOverlay/Android.bp
@@ -0,0 +1,11 @@
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+runtime_resource_overlay {
+ name: "PrimaryColorDarkGrayOverlay",
+ theme: "PrimaryColorDarkGrayOverlay",
+ sdk_version: "current",
+ product_specific: true,
+ resource_dirs: ["res"],
+}
diff --git a/themes/overlays/PrimaryColorDarkGray/AndroidManifest.xml b/themes/overlays/PrimaryColorDarkGrayOverlay/AndroidManifest.xml
similarity index 100%
rename from themes/overlays/PrimaryColorDarkGray/AndroidManifest.xml
rename to themes/overlays/PrimaryColorDarkGrayOverlay/AndroidManifest.xml
diff --git a/themes/overlays/PrimaryColorDarkGray/res/values/colors.xml b/themes/overlays/PrimaryColorDarkGrayOverlay/res/values/colors.xml
similarity index 100%
rename from themes/overlays/PrimaryColorDarkGray/res/values/colors.xml
rename to themes/overlays/PrimaryColorDarkGrayOverlay/res/values/colors.xml
diff --git a/themes/overlays/PrimaryColorDarkGray/res/values/strings.xml b/themes/overlays/PrimaryColorDarkGrayOverlay/res/values/strings.xml
similarity index 100%
rename from themes/overlays/PrimaryColorDarkGray/res/values/strings.xml
rename to themes/overlays/PrimaryColorDarkGrayOverlay/res/values/strings.xml