Fix CarDiagnosticConstantsTest to workaround an issue in generated HAL code
am: 64fb54b08e
Change-Id: I8aa936037239d80cffcc84b962cfe27f838976ba
diff --git a/service/Android.mk b/service/Android.mk
index 46bb9da..9bd5e12 100644
--- a/service/Android.mk
+++ b/service/Android.mk
@@ -38,8 +38,9 @@
LOCAL_JAVA_LIBRARIES += android.car
LOCAL_STATIC_JAVA_LIBRARIES += \
- android.hardware.automotive.vehicle-V2.0-java-static \
- android.hardware.automotive.vehicle-V2.1-java-static \
+ android.hidl.base-V1.0-java \
+ android.hardware.automotive.vehicle-V2.0-java \
+ android.hardware.automotive.vehicle-V2.1-java \
vehicle-hal-support-lib \
car-systemtest \
@@ -57,8 +58,9 @@
LOCAL_JAVA_LIBRARIES += android.car
LOCAL_STATIC_JAVA_LIBRARIES += \
- android.hardware.automotive.vehicle-V2.0-java-static \
- android.hardware.automotive.vehicle-V2.1-java-static \
+ android.hidl.base-V1.0-java \
+ android.hardware.automotive.vehicle-V2.0-java \
+ android.hardware.automotive.vehicle-V2.1-java \
vehicle-hal-support-lib \
car-systemtest \
diff --git a/tests/EmbeddedKitchenSinkApp/Android.mk b/tests/EmbeddedKitchenSinkApp/Android.mk
index d661902..37c79f7 100644
--- a/tests/EmbeddedKitchenSinkApp/Android.mk
+++ b/tests/EmbeddedKitchenSinkApp/Android.mk
@@ -40,7 +40,8 @@
LOCAL_DEX_PREOPT := false
LOCAL_STATIC_JAVA_LIBRARIES += \
- android.hardware.automotive.vehicle-V2.0-java-static \
+ android.hidl.base-V1.0-java \
+ android.hardware.automotive.vehicle-V2.0-java \
vehicle-hal-support-lib \
car-service-lib-for-test \
diff --git a/tests/android_car_api_test/Android.mk b/tests/android_car_api_test/Android.mk
index 306a240..58a1288 100644
--- a/tests/android_car_api_test/Android.mk
+++ b/tests/android_car_api_test/Android.mk
@@ -35,7 +35,8 @@
LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test
LOCAL_STATIC_JAVA_LIBRARIES += \
android-support-test \
- android.hardware.automotive.vehicle-V2.0-java-static \
+ android.hidl.base-V1.0-java \
+ android.hardware.automotive.vehicle-V2.0-java \
LOCAL_JAVA_LIBRARIES := android.car android.test.runner
diff --git a/tests/vehiclehal_test/Android.mk b/tests/vehiclehal_test/Android.mk
index 43aa41f..a22ee1b 100644
--- a/tests/vehiclehal_test/Android.mk
+++ b/tests/vehiclehal_test/Android.mk
@@ -33,8 +33,9 @@
LOCAL_STATIC_JAVA_LIBRARIES += vehicle-hal-support-lib \
android-support-test \
- android.hardware.automotive.vehicle-V2.0-java-static \
- android.hardware.automotive.vehicle-V2.1-java-static
+ android.hidl.base-V1.0-java \
+ android.hardware.automotive.vehicle-V2.0-java \
+ android.hardware.automotive.vehicle-V2.1-java
LOCAL_JAVA_LIBRARIES := android.car android.test.runner
diff --git a/vehicle-hal-support-lib/Android.mk b/vehicle-hal-support-lib/Android.mk
index 638e5cf..9ff39c6 100644
--- a/vehicle-hal-support-lib/Android.mk
+++ b/vehicle-hal-support-lib/Android.mk
@@ -24,8 +24,9 @@
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_STATIC_JAVA_LIBRARIES := \
- android.hardware.automotive.vehicle-V2.0-java-static \
- android.hardware.automotive.vehicle-V2.1-java-static \
+ android.hidl.base-V1.0-java \
+ android.hardware.automotive.vehicle-V2.0-java \
+ android.hardware.automotive.vehicle-V2.1-java \
junit \
legacy-android-test