Merge "Keep a single/shared RRO APEX" into main

10 files changed, 8 insertions, 70 deletions

diff --git a/apex/com.google.aosp_cf_phone.rros/Android.bp b/apex/com.google.aosp_cf.rros/Android.bp
index 325e1b340..acb3add46 100644
--- a/apex/com.google.aosp_cf_phone.rros/Android.bp
+++ b/apex/com.google.aosp_cf.rros/Android.bp
@@ -17,19 +17,18 @@ package {
 }
 
 apex {
-    name: "com.google.aosp_cf_phone.rros",
+    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",
-    use_vndk_as_stable: true,
     updatable: false,
-    // Install the apex in /vendor/apex
     soc_specific: true,
+
+    // RROs shared across CF-derived devices
     rros: [
         "cuttlefish_overlay_connectivity",
         "cuttlefish_overlay_frameworks_base_core",
         "cuttlefish_overlay_settings_provider",
-        "cuttlefish_phone_overlay_frameworks_base_core",
     ],
 }
diff --git a/apex/com.google.aosp_cf.rros/apex_manifest.json b/apex/com.google.aosp_cf.rros/apex_manifest.json
new file mode 100644
index 000000000..faf4eef25
--- /dev/null
+++ b/apex/com.google.aosp_cf.rros/apex_manifest.json
@@ -0,0 +1,4 @@
+{
+  "name": "com.google.aosp_cf.rros",
+  "version": 1
+}
diff --git a/apex/com.google.aosp_cf_phone.rros/file_contexts b/apex/com.google.aosp_cf.rros/file_contexts
index cb7fd8dc3..cb7fd8dc3 100644
--- a/apex/com.google.aosp_cf_phone.rros/file_contexts
+++ b/apex/com.google.aosp_cf.rros/file_contexts
diff --git a/apex/com.google.aosp_cf_phone.rros/apex_manifest.json b/apex/com.google.aosp_cf_phone.rros/apex_manifest.json
deleted file mode 100644
index e5ebe27d7..000000000
--- a/apex/com.google.aosp_cf_phone.rros/apex_manifest.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "name": "com.google.aosp_cf_phone.rros",
-  "version": 1
-}
diff --git a/apex/com.google.aosp_cf_slim.rros/Android.bp b/apex/com.google.aosp_cf_slim.rros/Android.bp
deleted file mode 100644
index 1a98d1c2d..000000000
--- a/apex/com.google.aosp_cf_slim.rros/Android.bp
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright (C) 2022 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.
-
-soong_namespace {
-    imports: [
-        "device/generic/goldfish",
-    ],
-}
-
-package {
-    default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
-apex {
-    name: "com.google.aosp_cf_slim.rros",
-    manifest: "apex_manifest.json",
-    key: "com.google.cf.apex.key",
-    certificate: ":com.google.cf.apex.certificate",
-    file_contexts: "file_contexts",
-    use_vndk_as_stable: true,
-    updatable: false,
-    // Install the apex in /vendor/apex
-    soc_specific: true,
-    rros: [
-        "slim_overlay_frameworks_base_core",
-    ],
-}
diff --git a/apex/com.google.aosp_cf_slim.rros/apex_manifest.json b/apex/com.google.aosp_cf_slim.rros/apex_manifest.json
deleted file mode 100644
index 26c7bd5b5..000000000
--- a/apex/com.google.aosp_cf_slim.rros/apex_manifest.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "name": "com.google.aosp_cf_slim.rros",
-  "version": 1
-}
diff --git a/apex/com.google.aosp_cf_slim.rros/file_contexts b/apex/com.google.aosp_cf_slim.rros/file_contexts
deleted file mode 100644
index cb7fd8dc3..000000000
--- a/apex/com.google.aosp_cf_slim.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 962a34b63..c645aee5c 100644
--- a/shared/device.mk
+++ b/shared/device.mk
@@ -180,13 +180,7 @@ PRODUCT_PACKAGES += \
     hidl_lazy_cb_test_server
 
 # Runtime Resource Overlays
-ifneq ($(LOCAL_PREFER_VENDOR_APEX),true)
-PRODUCT_PACKAGES += \
-    cuttlefish_overlay_connectivity \
-    cuttlefish_overlay_frameworks_base_core \
-    cuttlefish_overlay_settings_provider
-
-endif
+PRODUCT_PACKAGES += com.google.aosp_cf.rros
 
 #
 # Satellite vendor service for CF
diff --git a/shared/phone/device_vendor.mk b/shared/phone/device_vendor.mk
index e7f127611..e22a22ff8 100644
--- a/shared/phone/device_vendor.mk
+++ b/shared/phone/device_vendor.mk
@@ -59,11 +59,7 @@ PRODUCT_COPY_FILES += \
 DEVICE_PACKAGE_OVERLAYS += device/google/cuttlefish/shared/phone/overlay
 
 # Runtime Resource Overlays
-ifeq ($(LOCAL_PREFER_VENDOR_APEX),true)
-PRODUCT_PACKAGES += com.google.aosp_cf_phone.rros
-else
 PRODUCT_PACKAGES += cuttlefish_phone_overlay_frameworks_base_core
-endif
 
 # NFC AIDL HAL
 PRODUCT_PACKAGES += \
diff --git a/shared/slim/device_vendor.mk b/shared/slim/device_vendor.mk
index 127ac4ac2..e980edfb6 100644
--- a/shared/slim/device_vendor.mk
+++ b/shared/slim/device_vendor.mk
@@ -48,16 +48,9 @@ PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.hardware.faketouch.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.faketouch.xml \
     frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml \
 
-
 # Runtime Resource Overlays
-ifeq ($(LOCAL_PREFER_VENDOR_APEX),true)
-PRODUCT_PACKAGES += \
-    com.google.aosp_cf_phone.rros \
-    com.google.aosp_cf_slim.rros
-else
 PRODUCT_PACKAGES += \
     cuttlefish_phone_overlay_frameworks_base_core \
     slim_overlay_frameworks_base_core
-endif
 
 TARGET_BOARD_INFO_FILE ?= device/google/cuttlefish/shared/slim/android-info.txt