summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavel Maltsev <pavelm@google.com>2017-07-17 12:22:15 -0700
committerPavel Maltsev <pavelm@google.com>2017-07-17 12:25:05 -0700
commite1ac93dca1634b7e211f33d025c8d7fa08bc10a8 (patch)
treecdec917003daaa3778ac1005503a0014611b8a97
parent3578ac694ee4fe0016d802c2d8b45dee99dee564 (diff)
downloadcar-e1ac93dca1634b7e211f33d025c8d7fa08bc10a8.tar.gz
Add default vhal impl to car emulator
VHAL package was removed from bat_car.mk as it needs to be added on per-device configuration Remove legacy VHAL Bug: b/63702569 Test: was able to build car_emu_x86_64-userdebug Change-Id: I1e95871c5e70d77b8bd0d6bcf06912a4a03242e5
-rw-r--r--car-arm64/aosp_car_emu_arm64.mk4
-rw-r--r--car-armv7-a-neon/aosp_car_emu_arm.mk4
-rw-r--r--car-x86/aosp_car_emu_x86.mk4
-rw-r--r--car-x86_64/aosp_car_emu_x86_64.mk4
4 files changed, 8 insertions, 8 deletions
diff --git a/car-arm64/aosp_car_emu_arm64.mk b/car-arm64/aosp_car_emu_arm64.mk
index e56b1b7..a407573 100644
--- a/car-arm64/aosp_car_emu_arm64.mk
+++ b/car-arm64/aosp_car_emu_arm64.mk
@@ -29,8 +29,8 @@ PRODUCT_DEVICE := car-arm64
PRODUCT_RESTRICT_VENDOR_FILES := false
-PRODUCT_PACKAGES += \
- vehicle.default
+PRODUCT_PACKAGES += android.hardware.automotive.vehicle@2.1-service
+
# Replace framework versions with dummy one, which is essentially
# the same as removing the xml. Needs this as there is no easy
# way to remove PRODUCT_COPY_FILES from inherited products.
diff --git a/car-armv7-a-neon/aosp_car_emu_arm.mk b/car-armv7-a-neon/aosp_car_emu_arm.mk
index f7f2fe5..aa31866 100644
--- a/car-armv7-a-neon/aosp_car_emu_arm.mk
+++ b/car-armv7-a-neon/aosp_car_emu_arm.mk
@@ -29,8 +29,8 @@ PRODUCT_DEVICE := car-armv7-a-neon
PRODUCT_RESTRICT_VENDOR_FILES := false
-PRODUCT_PACKAGES += \
- vehicle.default
+PRODUCT_PACKAGES += android.hardware.automotive.vehicle@2.1-service
+
# Replace framework versions with dummy one, which is essentially
# the same as removing the xml. Needs this as there is no easy
# way to remove PRODUCT_COPY_FILES from inherited products.
diff --git a/car-x86/aosp_car_emu_x86.mk b/car-x86/aosp_car_emu_x86.mk
index 37b4f0e..7a6db8e 100644
--- a/car-x86/aosp_car_emu_x86.mk
+++ b/car-x86/aosp_car_emu_x86.mk
@@ -29,8 +29,8 @@ PRODUCT_DEVICE := car-x86
PRODUCT_RESTRICT_VENDOR_FILES := false
-PRODUCT_PACKAGES += \
- vehicle.default
+PRODUCT_PACKAGES += android.hardware.automotive.vehicle@2.1-service
+
# Replace framework versions with dummy one, which is essentially
# the same as removing the xml. Needs this as there is no easy
# way to remove PRODUCT_COPY_FILES from inherited products.
diff --git a/car-x86_64/aosp_car_emu_x86_64.mk b/car-x86_64/aosp_car_emu_x86_64.mk
index e568bd0..dde13e4 100644
--- a/car-x86_64/aosp_car_emu_x86_64.mk
+++ b/car-x86_64/aosp_car_emu_x86_64.mk
@@ -29,8 +29,8 @@ PRODUCT_DEVICE := car-x86_64
PRODUCT_RESTRICT_VENDOR_FILES := false
-PRODUCT_PACKAGES += \
- vehicle.default
+PRODUCT_PACKAGES += android.hardware.automotive.vehicle@2.1-service
+
# Replace framework versions with dummy one, which is essentially
# the same as removing the xml. Needs this as there is no easy
# way to remove PRODUCT_COPY_FILES from inherited products.