Car: remove use of -static hidl java am: be4780ccce am: 8b9969b76e am: 79295cd9a2
am: 8d62530216
Change-Id: I711ab62df46472ecd3a7f0a0b7af9bcf4f81ddf5
diff --git a/service/Android.mk b/service/Android.mk
index 46bb9da..0192823 100644
--- a/service/Android.mk
+++ b/service/Android.mk
@@ -38,8 +38,8 @@
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.hardware.automotive.vehicle-V2.0-java \
+ android.hardware.automotive.vehicle-V2.1-java \
vehicle-hal-support-lib \
car-systemtest \
@@ -57,8 +57,8 @@
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.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..c8ece9f 100644
--- a/tests/EmbeddedKitchenSinkApp/Android.mk
+++ b/tests/EmbeddedKitchenSinkApp/Android.mk
@@ -40,7 +40,7 @@
LOCAL_DEX_PREOPT := false
LOCAL_STATIC_JAVA_LIBRARIES += \
- android.hardware.automotive.vehicle-V2.0-java-static \
+ 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..0e47bb6 100644
--- a/tests/android_car_api_test/Android.mk
+++ b/tests/android_car_api_test/Android.mk
@@ -35,7 +35,7 @@
LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test
LOCAL_STATIC_JAVA_LIBRARIES += \
android-support-test \
- android.hardware.automotive.vehicle-V2.0-java-static \
+ 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..2c85c65 100644
--- a/tests/vehiclehal_test/Android.mk
+++ b/tests/vehiclehal_test/Android.mk
@@ -33,8 +33,8 @@
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.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..688fb24 100644
--- a/vehicle-hal-support-lib/Android.mk
+++ b/vehicle-hal-support-lib/Android.mk
@@ -24,8 +24,8 @@
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.hardware.automotive.vehicle-V2.0-java \
+ android.hardware.automotive.vehicle-V2.1-java \
junit \
legacy-android-test