Merge "Remove RROs APEX" into main

4 files changed, 6 insertions, 43 deletions

diff --git a/apex/com.google.aosp_cf.rros/Android.bp b/apex/com.google.aosp_cf.rros/Android.bp
deleted file mode 100644
index 43d0b7bbe..000000000
--- a/apex/com.google.aosp_cf.rros/Android.bp
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright (C) 2021 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 {
-    default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
-apex {
-    name: "com.google.aosp_cf.rros",
-    manifest: "apex_manifest.json",
-    key: "com.google.cf.apex.key",
-    certificate: ":com.google.cf.apex.certificate",
-    file_contexts: "file_contexts",
-    updatable: false,
-    soc_specific: true,
-
-    // RROs shared across CF-derived devices
-    rros: [
-        "cuttlefish_overlay_connectivity",
-        "cuttlefish_overlay_frameworks_base_core",
-        "cuttlefish_overlay_nfc",
-        "cuttlefish_overlay_settings_provider",
-        "cuttlefish_overlay_uwb",
-    ],
-}
diff --git a/apex/com.google.aosp_cf.rros/apex_manifest.json b/apex/com.google.aosp_cf.rros/apex_manifest.json
deleted file mode 100644
index faf4eef25..000000000
--- a/apex/com.google.aosp_cf.rros/apex_manifest.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "name": "com.google.aosp_cf.rros",
-  "version": 1
-}
diff --git a/apex/com.google.aosp_cf.rros/file_contexts b/apex/com.google.aosp_cf.rros/file_contexts
deleted file mode 100644
index cb7fd8dc3..000000000
--- a/apex/com.google.aosp_cf.rros/file_contexts
+++ /dev/null
@@ -1,2 +0,0 @@
-(/.*)?		u:object_r:vendor_file:s0
-/overlay(/.*)?	u:object_r:vendor_overlay_file:s0
diff --git a/shared/device.mk b/shared/device.mk
index cb69217b1..fdb2a0cb1 100644
--- a/shared/device.mk
+++ b/shared/device.mk
@@ -181,7 +181,12 @@ PRODUCT_PACKAGES += \
     aidl_lazy_cb_test_server \
 
 # Runtime Resource Overlays
-PRODUCT_PACKAGES += com.google.aosp_cf.rros
+PRODUCT_PACKAGES += \
+    cuttlefish_overlay_connectivity \
+    cuttlefish_overlay_frameworks_base_core \
+    cuttlefish_overlay_nfc \
+    cuttlefish_overlay_settings_provider \
+    cuttlefish_overlay_uwb \
 
 #
 # Satellite vendor service for CF