Convert Android.mk of pixel 6 series to Android.bp
Bug: 309566529
Test: m EmulationPixel6ProOverlay \
SystemUIEmulationPixel6ProOverlay \
EmulationPixel6Overlay \
SystemUIEmulationPixel6Overlay \
EmulationPixel6aOverlay \
SystemUIEmulationPixel6aOverlay
Change-Id: Ia68f427ba50fae32378b7e5b65bcb77ef073998b
diff --git a/overlay/frameworks/base/packages/overlays/pixel_6/AndroidOverlay/Android.bp b/overlay/frameworks/base/packages/overlays/pixel_6/AndroidOverlay/Android.bp
new file mode 100644
index 0000000..820ea6d
--- /dev/null
+++ b/overlay/frameworks/base/packages/overlays/pixel_6/AndroidOverlay/Android.bp
@@ -0,0 +1,30 @@
+//
+// Copyright 2023, 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.
+//
+
+package {
+ // See: http://go/android-license-faq
+ default_applicable_licenses: [
+ "Android-Apache-2.0",
+ ],
+}
+
+runtime_resource_overlay {
+ name: "EmulationPixel6Overlay",
+ theme: "EmulationPixel6",
+ product_specific: true,
+ sdk_version: "current",
+ resource_dirs: ["res"],
+}
diff --git a/overlay/frameworks/base/packages/overlays/pixel_6/AndroidOverlay/Android.mk b/overlay/frameworks/base/packages/overlays/pixel_6/AndroidOverlay/Android.mk
deleted file mode 100644
index 16d68bb..0000000
--- a/overlay/frameworks/base/packages/overlays/pixel_6/AndroidOverlay/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# Copyright 2023, 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 := EmulationPixel6
-
-LOCAL_PRODUCT_MODULE := true
-
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-LOCAL_PACKAGE_NAME := EmulationPixel6Overlay
-LOCAL_SDK_VERSION := current
-
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS := notice
-include $(BUILD_RRO_PACKAGE)
diff --git a/overlay/frameworks/base/packages/overlays/pixel_6/SystemUIOverlay/Android.bp b/overlay/frameworks/base/packages/overlays/pixel_6/SystemUIOverlay/Android.bp
new file mode 100644
index 0000000..61eda26
--- /dev/null
+++ b/overlay/frameworks/base/packages/overlays/pixel_6/SystemUIOverlay/Android.bp
@@ -0,0 +1,30 @@
+//
+// Copyright 2023, 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.
+//
+
+package {
+ // See: http://go/android-license-faq
+ default_applicable_licenses: [
+ "Android-Apache-2.0",
+ ],
+}
+
+runtime_resource_overlay {
+ name: "SystemUIEmulationPixel6Overlay",
+ theme: "SystemUIEmulationPixel6",
+ product_specific: true,
+ sdk_version: "current",
+ resource_dirs: ["res"],
+}
diff --git a/overlay/frameworks/base/packages/overlays/pixel_6/SystemUIOverlay/Android.mk b/overlay/frameworks/base/packages/overlays/pixel_6/SystemUIOverlay/Android.mk
deleted file mode 100644
index 6b56927..0000000
--- a/overlay/frameworks/base/packages/overlays/pixel_6/SystemUIOverlay/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# Copyright 2023, 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 := SystemUIEmulationPixel6
-
-LOCAL_PRODUCT_MODULE := true
-
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-LOCAL_PACKAGE_NAME := SystemUIEmulationPixel6Overlay
-LOCAL_SDK_VERSION := current
-
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS := notice
-include $(BUILD_RRO_PACKAGE)
diff --git a/overlay/frameworks/base/packages/overlays/pixel_6_pro/AndroidOverlay/Android.bp b/overlay/frameworks/base/packages/overlays/pixel_6_pro/AndroidOverlay/Android.bp
new file mode 100644
index 0000000..8260184
--- /dev/null
+++ b/overlay/frameworks/base/packages/overlays/pixel_6_pro/AndroidOverlay/Android.bp
@@ -0,0 +1,30 @@
+//
+// Copyright 2023, 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.
+//
+
+package {
+ // See: http://go/android-license-faq
+ default_applicable_licenses: [
+ "Android-Apache-2.0",
+ ],
+}
+
+runtime_resource_overlay {
+ name: "EmulationPixel6ProOverlay",
+ theme: "EmulationPixel6Pro",
+ product_specific: true,
+ sdk_version: "current",
+ resource_dirs: ["res"],
+}
diff --git a/overlay/frameworks/base/packages/overlays/pixel_6_pro/AndroidOverlay/Android.mk b/overlay/frameworks/base/packages/overlays/pixel_6_pro/AndroidOverlay/Android.mk
deleted file mode 100644
index b16393d..0000000
--- a/overlay/frameworks/base/packages/overlays/pixel_6_pro/AndroidOverlay/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# Copyright 2023, 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 := EmulationPixel6Pro
-
-LOCAL_PRODUCT_MODULE := true
-
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-LOCAL_PACKAGE_NAME := EmulationPixel6ProOverlay
-LOCAL_SDK_VERSION := current
-
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS := notice
-include $(BUILD_RRO_PACKAGE)
diff --git a/overlay/frameworks/base/packages/overlays/pixel_6_pro/SystemUIOverlay/Android.bp b/overlay/frameworks/base/packages/overlays/pixel_6_pro/SystemUIOverlay/Android.bp
new file mode 100644
index 0000000..48a481f
--- /dev/null
+++ b/overlay/frameworks/base/packages/overlays/pixel_6_pro/SystemUIOverlay/Android.bp
@@ -0,0 +1,30 @@
+//
+// Copyright 2023, 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.
+//
+
+package {
+ // See: http://go/android-license-faq
+ default_applicable_licenses: [
+ "Android-Apache-2.0",
+ ],
+}
+
+runtime_resource_overlay {
+ name: "SystemUIEmulationPixel6ProOverlay",
+ theme: "SystemUIEmulationPixel6Pro",
+ product_specific: true,
+ sdk_version: "current",
+ resource_dirs: ["res"],
+}
diff --git a/overlay/frameworks/base/packages/overlays/pixel_6_pro/SystemUIOverlay/Android.mk b/overlay/frameworks/base/packages/overlays/pixel_6_pro/SystemUIOverlay/Android.mk
deleted file mode 100644
index f72e2e1..0000000
--- a/overlay/frameworks/base/packages/overlays/pixel_6_pro/SystemUIOverlay/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# Copyright 2023, 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 := SystemUIEmulationPixel6Pro
-
-LOCAL_PRODUCT_MODULE := true
-
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-LOCAL_PACKAGE_NAME := SystemUIEmulationPixel6ProOverlay
-LOCAL_SDK_VERSION := current
-
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS := notice
-include $(BUILD_RRO_PACKAGE)
diff --git a/overlay/frameworks/base/packages/overlays/pixel_6a/AndroidOverlay/Android.bp b/overlay/frameworks/base/packages/overlays/pixel_6a/AndroidOverlay/Android.bp
new file mode 100644
index 0000000..8882a71
--- /dev/null
+++ b/overlay/frameworks/base/packages/overlays/pixel_6a/AndroidOverlay/Android.bp
@@ -0,0 +1,30 @@
+//
+// Copyright 2023, 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.
+//
+
+package {
+ // See: http://go/android-license-faq
+ default_applicable_licenses: [
+ "Android-Apache-2.0",
+ ],
+}
+
+runtime_resource_overlay {
+ name: "EmulationPixel6aOverlay",
+ theme: "EmulationPixel6a",
+ product_specific: true,
+ sdk_version: "current",
+ resource_dirs: ["res"],
+}
diff --git a/overlay/frameworks/base/packages/overlays/pixel_6a/AndroidOverlay/Android.mk b/overlay/frameworks/base/packages/overlays/pixel_6a/AndroidOverlay/Android.mk
deleted file mode 100644
index cc8e8e8..0000000
--- a/overlay/frameworks/base/packages/overlays/pixel_6a/AndroidOverlay/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# Copyright 2023, 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 := EmulationPixel6a
-
-LOCAL_PRODUCT_MODULE := true
-
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-LOCAL_PACKAGE_NAME := EmulationPixel6aOverlay
-LOCAL_SDK_VERSION := current
-
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS := notice
-include $(BUILD_RRO_PACKAGE)
diff --git a/overlay/frameworks/base/packages/overlays/pixel_6a/SystemUIOverlay/Android.bp b/overlay/frameworks/base/packages/overlays/pixel_6a/SystemUIOverlay/Android.bp
new file mode 100644
index 0000000..c9d97fa
--- /dev/null
+++ b/overlay/frameworks/base/packages/overlays/pixel_6a/SystemUIOverlay/Android.bp
@@ -0,0 +1,30 @@
+//
+// Copyright 2023, 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.
+//
+
+package {
+ // See: http://go/android-license-faq
+ default_applicable_licenses: [
+ "Android-Apache-2.0",
+ ],
+}
+
+runtime_resource_overlay {
+ name: "SystemUIEmulationPixel6aOverlay",
+ theme: "SystemUIEmulationPixel6a",
+ product_specific: true,
+ sdk_version: "current",
+ resource_dirs: ["res"],
+}
diff --git a/overlay/frameworks/base/packages/overlays/pixel_6a/SystemUIOverlay/Android.mk b/overlay/frameworks/base/packages/overlays/pixel_6a/SystemUIOverlay/Android.mk
deleted file mode 100644
index 42778ea..0000000
--- a/overlay/frameworks/base/packages/overlays/pixel_6a/SystemUIOverlay/Android.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# Copyright 2023, 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 := SystemUIEmulationPixel6a
-
-LOCAL_PRODUCT_MODULE := true
-
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-LOCAL_PACKAGE_NAME := SystemUIEmulationPixel6aOverlay
-LOCAL_SDK_VERSION := current
-
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS := notice
-include $(BUILD_RRO_PACKAGE)
