diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-04-30 01:47:58 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-04-30 01:47:58 +0000 |
commit | 757029875b5d34905764ea0503d9c066d123fdb2 (patch) | |
tree | bd787bf9a9cf7fb89f2d70d9ff0d0226338782f6 | |
parent | bd719df28f4b981830426b41db7b164b06f101fe (diff) | |
parent | cedb0bcc868c4ad1ed9f3ffe1d83faa72a45ed1c (diff) | |
download | car-757029875b5d34905764ea0503d9c066d123fdb2.tar.gz |
Snap for 8515382 from 52ba0ee457917c15a3ad178cf51994425a707e4a to tm-release am: cedb0bcc86
Original change: https://googleplex-android-review.googlesource.com/c/device/generic/car/+/18086589
Change-Id: I51dbd775c99cf78eab7579dca697cb6ee83bec81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | emulator/aosp_car_emulator.mk | 2 | ||||
-rw-r--r-- | emulator/cluster/rro_overlays/CarServiceOverlay/Android.bp | 7 |
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", -} |