summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-04-29 04:39:39 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2022-04-29 04:39:39 +0000
commitcedb0bcc868c4ad1ed9f3ffe1d83faa72a45ed1c (patch)
treebd787bf9a9cf7fb89f2d70d9ff0d0226338782f6
parent9fa8079f1b0a9727251a516474d318d7fac14e8f (diff)
parent52ba0ee457917c15a3ad178cf51994425a707e4a (diff)
downloadcar-cedb0bcc868c4ad1ed9f3ffe1d83faa72a45ed1c.tar.gz
Snap for 8515382 from 52ba0ee457917c15a3ad178cf51994425a707e4a to tm-release
Change-Id: I85103e0c7279f6d60c696f542762140a049f59db
-rw-r--r--emulator/aosp_car_emulator.mk2
-rw-r--r--emulator/cluster/rro_overlays/CarServiceOverlay/Android.bp7
2 files changed, 0 insertions, 9 deletions
diff --git a/emulator/aosp_car_emulator.mk b/emulator/aosp_car_emulator.mk
index c1d24bf..f0810a9 100644
--- a/emulator/aosp_car_emulator.mk
+++ b/emulator/aosp_car_emulator.mk
@@ -38,10 +38,8 @@ PRODUCT_PRODUCT_PROPERTIES += \
ifeq (true,$(ENABLE_CLUSTER_OS_DOUBLE))
PRODUCT_PACKAGES += CarServiceOverlayEmulatorOsDouble
-GOOGLE_CAR_SERVICE_OVERLAY += CarServiceOverlayEmulatorOsDoubleGoogle
else
PRODUCT_PACKAGES += CarServiceOverlayEmulator
-GOOGLE_CAR_SERVICE_OVERLAY += CarServiceOverlayEmulatorGoogle
endif # ENABLE_CLUSTER_OS_DOUBLE
endif # BUILD_EMULATOR_CLUSTER_DISPLAY
diff --git a/emulator/cluster/rro_overlays/CarServiceOverlay/Android.bp b/emulator/cluster/rro_overlays/CarServiceOverlay/Android.bp
index e4a1425..22fc331 100644
--- a/emulator/cluster/rro_overlays/CarServiceOverlay/Android.bp
+++ b/emulator/cluster/rro_overlays/CarServiceOverlay/Android.bp
@@ -25,10 +25,3 @@ runtime_resource_overlay {
sdk_version: "current",
product_specific: true
}
-
-override_runtime_resource_overlay {
- name: "CarServiceOverlayEmulatorGoogle",
- base: "CarServiceOverlayEmulator",
- package_name: "com.google.android.car.resources.emulator",
- target_package_name: "com.google.android.car.updatable",
-}