commit 2cc76d0f8f401f1b62d019da3a9c097c9f52804c
author Pavel Maltsev <pavelm@google.com> Tue Feb 14 12:28:33 2017 -0800
committer Pavel Maltsev <pavelm@google.com> Wed Feb 15 13:21:19 2017 -0800
tree 56e37137e391b4583437cc6c8342caa10510bffa
parent b02bcaec4f6507647a3f3fc0c37a50a936950aa9

Support VHAL 2.1 in Car Service

Bug: b/34716856

Test: manual
Change-Id: I6c5f83fc097dcc373fb3a97a4c57f9c143a73a70

car_product/build/car_base.mk

diff --git a/car_product/build/car_base.mk b/car_product/build/car_base.mk
index eb3145b..6544dc1 100644
--- a/car_product/build/car_base.mk
+++ b/car_product/build/car_base.mk
@@ -81,7 +81,12 @@
     requestsync \
     wifi-service \
     A2dpSinkService \
-    android.hardware.automotive.vehicle@2.0-service \
+
+ifeq ($(TARGET_USES_CAR_FUTURE_FEATURES),true)
+PRODUCT_PACKAGES += android.hardware.automotive.vehicle@2.1-service
+else
+PRODUCT_PACKAGES += android.hardware.automotive.vehicle@2.0-service
+endif
 
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core_minimal.mk)