summaryrefslogtreecommitdiffstats
path: root/crosshatch_car/aosp_crosshatch_car.mk
diff options
context:
space:
mode:
authorChangyeon Jo <changyeon@google.com>2020-03-24 16:33:15 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-03-24 16:33:15 +0000
commit8ba227bf9e6c7cdc0a8c23c989621b669e0e153f (patch)
tree6d5fa285fb5a1a9ba982412603fea526b08d7b9f /crosshatch_car/aosp_crosshatch_car.mk
parent144479556530954e02af8a66180a18037ff92a7f (diff)
parent3ec43dd669f91d4cfc3e580a1977f374bec21301 (diff)
downloaddevice_google_car-8ba227bf9e6c7cdc0a8c23c989621b669e0e153f.tar.gz
device_google_car-8ba227bf9e6c7cdc0a8c23c989621b669e0e153f.tar.bz2
device_google_car-8ba227bf9e6c7cdc0a8c23c989621b669e0e153f.zip
Merge "Add EVS packages to bluecross/floral devices" into rvc-dev
Diffstat (limited to 'crosshatch_car/aosp_crosshatch_car.mk')
-rw-r--r--crosshatch_car/aosp_crosshatch_car.mk11
1 files changed, 9 insertions, 2 deletions
diff --git a/crosshatch_car/aosp_crosshatch_car.mk b/crosshatch_car/aosp_crosshatch_car.mk
index 7d4abed..bfa5d9b 100644
--- a/crosshatch_car/aosp_crosshatch_car.mk
+++ b/crosshatch_car/aosp_crosshatch_car.mk
@@ -53,8 +53,7 @@ PRODUCT_PACKAGES += \
# Car init.rc
PRODUCT_COPY_FILES += \
packages/services/Car/car_product/init/init.bootstat.rc:root/init.bootstat.rc \
- packages/services/Car/car_product/init/init.car.rc:root/init.car.rc \
- $(LOCAL_PATH)/vendor/automotive.evs@1.0-service.rc:/vendor/etc/init/android.hardware.automotive.evs@1.0-service.rc
+ packages/services/Car/car_product/init/init.car.rc:root/init.car.rc
# Override heap growth limit due to high display density on device
PRODUCT_PROPERTY_OVERRIDES += \
@@ -98,6 +97,14 @@ PRODUCT_COPY_FILES += \
PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.broadcastradio.xml:system/etc/permissions/android.hardware.broadcastradio.xml
+# EVS v1.1
+PRODUCT_PACKAGES += android.automotive.evs.manager@1.1 \
+ android.hardware.automotive.evs@1.1-sample \
+ evs_app
+PRODUCT_PRODUCT_PROPERTIES += persist.automotive.evs.mode=0
+
+# Automotive display service
+PRODUCT_PACKAGES += android.frameworks.automotive.display@1.0-service
#
# All components inherited here go to vendor image