diff options
author | Changyeon Jo <changyeon@google.com> | 2020-03-24 16:33:15 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-03-24 16:33:15 +0000 |
commit | 8ba227bf9e6c7cdc0a8c23c989621b669e0e153f (patch) | |
tree | 6d5fa285fb5a1a9ba982412603fea526b08d7b9f | |
parent | 144479556530954e02af8a66180a18037ff92a7f (diff) | |
parent | 3ec43dd669f91d4cfc3e580a1977f374bec21301 (diff) | |
download | device_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
-rw-r--r-- | AndroidProducts.mk | 14 | ||||
-rw-r--r-- | blueline_car/aosp_blueline_car.mk | 14 | ||||
-rw-r--r-- | blueline_car/device-common.mk | 3 | ||||
-rw-r--r-- | blueline_car/manifest.xml | 5 | ||||
-rw-r--r-- | blueline_car/vendor/automotive.evs@1.0-service.rc | 4 | ||||
-rw-r--r-- | coral_car/aosp_coral_car.mk | 9 | ||||
-rw-r--r-- | coral_car/device-common.mk | 3 | ||||
-rw-r--r-- | coral_car/manifest.xml | 10 | ||||
-rw-r--r-- | crosshatch_car/aosp_crosshatch_car.mk | 11 | ||||
-rw-r--r-- | crosshatch_car/device-common.mk | 3 | ||||
-rw-r--r-- | crosshatch_car/manifest.xml | 5 | ||||
-rw-r--r-- | crosshatch_car/vendor/automotive.evs@1.0-service.rc | 4 | ||||
-rw-r--r-- | flame_car/aosp_flame_car.mk | 9 | ||||
-rw-r--r-- | flame_car/device-common.mk | 3 | ||||
-rw-r--r-- | flame_car/manifest.xml | 10 |
15 files changed, 84 insertions, 23 deletions
diff --git a/AndroidProducts.mk b/AndroidProducts.mk index 844bb02..1a31316 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2019 The Android Open-Source Project +# Copyright 2020 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. @@ -15,9 +15,13 @@ # PRODUCT_MAKEFILES := \ - $(LOCAL_DIR)/crosshatch_car/aosp_crosshatch_car.mk \ - $(LOCAL_DIR)/coral_car/aosp_coral_car.mk + $(LOCAL_DIR)/blueline_car/aosp_blueline_car.mk \ + $(LOCAL_DIR)/flame_car/aosp_flame_car.mk \ + $(LOCAL_DIR)/coral_car/aosp_coral_car.mk \ + $(LOCAL_DIR)/crosshatch_car/aosp_crosshatch_car.mk COMMON_LUNCH_CHOICES := \ - aosp_crosshatch_car-userdebug \ - aosp_coral_car-userdebug + aosp_blueline_car-userdebug \ + aosp_flame_car-userdebug \ + aosp_coral_car-userdebug \ + aosp_crosshatch_car-userdebug diff --git a/blueline_car/aosp_blueline_car.mk b/blueline_car/aosp_blueline_car.mk index 24343aa..b9aafdf 100644 --- a/blueline_car/aosp_blueline_car.mk +++ b/blueline_car/aosp_blueline_car.mk @@ -47,14 +47,12 @@ PRODUCT_PACKAGES += \ android.hardware.automotive.vehicle@2.0-service PRODUCT_PACKAGES += \ - android.hardware.automotive.audiocontrol@1.0-service \ - android.hardware.automotive.evs@1.0-service + android.hardware.automotive.audiocontrol@1.0-service # 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 +96,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 diff --git a/blueline_car/device-common.mk b/blueline_car/device-common.mk index 92e2120..db1faf1 100644 --- a/blueline_car/device-common.mk +++ b/blueline_car/device-common.mk @@ -152,3 +152,6 @@ AB_OTA_POSTINSTALL_CONFIG += \ POSTINSTALL_PATH_product=bin/check_dynamic_partitions \ FILESYSTEM_TYPE_product=ext4 \ POSTINSTALL_OPTIONAL_product=false \ + +# Sepolicy for EVS +BOARD_SEPOLICY_DIRS += packages/services/Car/evs/sepolicy diff --git a/blueline_car/manifest.xml b/blueline_car/manifest.xml index 1e376ad..65e8dac 100644 --- a/blueline_car/manifest.xml +++ b/blueline_car/manifest.xml @@ -35,10 +35,11 @@ <hal format="hidl"> <name>android.hardware.automotive.evs</name> <transport>hwbinder</transport> - <version>1.0</version> + <version>1.1</version> <interface> <name>IEvsEnumerator</name> - <instance>EvsEnumeratorHw</instance> + <instance>default</instance> + <instance>hw/1</instance> </interface> </hal> <!-- FIXME: Move this to shared manifest.xml --> diff --git a/blueline_car/vendor/automotive.evs@1.0-service.rc b/blueline_car/vendor/automotive.evs@1.0-service.rc deleted file mode 100644 index 117c249..0000000 --- a/blueline_car/vendor/automotive.evs@1.0-service.rc +++ /dev/null @@ -1,4 +0,0 @@ -service vendor.evs-hal-mock /vendor/bin/hw/android.hardware.automotive.evs@1.0-service - class hal - user automotive_evs - group automotive_evs diff --git a/coral_car/aosp_coral_car.mk b/coral_car/aosp_coral_car.mk index 385cd76..0ac830b 100644 --- a/coral_car/aosp_coral_car.mk +++ b/coral_car/aosp_coral_car.mk @@ -90,6 +90,15 @@ 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 # diff --git a/coral_car/device-common.mk b/coral_car/device-common.mk index 80e776b..dcc380b 100644 --- a/coral_car/device-common.mk +++ b/coral_car/device-common.mk @@ -120,3 +120,6 @@ PRODUCT_PRODUCT_PROPERTIES += \ ro.thermal_warmreset = true \ PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE := true + +# Sepolicy for EVS +BOARD_SEPOLICY_DIRS += packages/services/Car/evs/sepolicy diff --git a/coral_car/manifest.xml b/coral_car/manifest.xml index b042667..e12347f 100644 --- a/coral_car/manifest.xml +++ b/coral_car/manifest.xml @@ -23,6 +23,16 @@ <instance>default</instance> </interface> </hal> + <hal format="hidl"> + <name>android.hardware.automotive.evs</name> + <transport>hwbinder</transport> + <version>1.1</version> + <interface> + <name>IEvsEnumerator</name> + <instance>default</instance> + <instance>hw/1</instance> + </interface> + </hal> <!-- FIXME: Move this to shared manifest.xml --> <hal format="hidl"> <name>android.hardware.broadcastradio</name> 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 diff --git a/crosshatch_car/device-common.mk b/crosshatch_car/device-common.mk index e43e640..73d5389 100644 --- a/crosshatch_car/device-common.mk +++ b/crosshatch_car/device-common.mk @@ -154,3 +154,6 @@ AB_OTA_POSTINSTALL_CONFIG += \ POSTINSTALL_PATH_product=bin/check_dynamic_partitions \ FILESYSTEM_TYPE_product=ext4 \ POSTINSTALL_OPTIONAL_product=false \ + +# Sepolicy for EVS +BOARD_SEPOLICY_DIRS += packages/services/Car/evs/sepolicy diff --git a/crosshatch_car/manifest.xml b/crosshatch_car/manifest.xml index 29df885..9160ec2 100644 --- a/crosshatch_car/manifest.xml +++ b/crosshatch_car/manifest.xml @@ -35,10 +35,11 @@ <hal format="hidl"> <name>android.hardware.automotive.evs</name> <transport>hwbinder</transport> - <version>1.0</version> + <version>1.1</version> <interface> <name>IEvsEnumerator</name> - <instance>EvsEnumeratorHw</instance> + <instance>default</instance> + <instance>hw/1</instance> </interface> </hal> <!-- FIXME: Move this to shared manifest.xml --> diff --git a/crosshatch_car/vendor/automotive.evs@1.0-service.rc b/crosshatch_car/vendor/automotive.evs@1.0-service.rc deleted file mode 100644 index 117c249..0000000 --- a/crosshatch_car/vendor/automotive.evs@1.0-service.rc +++ /dev/null @@ -1,4 +0,0 @@ -service vendor.evs-hal-mock /vendor/bin/hw/android.hardware.automotive.evs@1.0-service - class hal - user automotive_evs - group automotive_evs diff --git a/flame_car/aosp_flame_car.mk b/flame_car/aosp_flame_car.mk index 96859ae..0b5a355 100644 --- a/flame_car/aosp_flame_car.mk +++ b/flame_car/aosp_flame_car.mk @@ -90,6 +90,15 @@ 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 # diff --git a/flame_car/device-common.mk b/flame_car/device-common.mk index a5f3e9a..a3e4606 100644 --- a/flame_car/device-common.mk +++ b/flame_car/device-common.mk @@ -120,3 +120,6 @@ PRODUCT_PRODUCT_PROPERTIES += \ ro.thermal_warmreset = true \ PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE := true + +# Sepolicy for EVS +BOARD_SEPOLICY_DIRS += packages/services/Car/evs/sepolicy diff --git a/flame_car/manifest.xml b/flame_car/manifest.xml index 6dfba01..5f23631 100644 --- a/flame_car/manifest.xml +++ b/flame_car/manifest.xml @@ -34,4 +34,14 @@ <instance>dab</instance> </interface> </hal> + <hal format="hidl"> + <name>android.hardware.automotive.evs</name> + <transport>hwbinder</transport> + <version>1.1</version> + <interface> + <name>IEvsEnumerator</name> + <instance>default</instance> + <instance>hw/1</instance> + </interface> + </hal> </manifest> |