diff options
| author | Steven Moreland <smoreland@google.com> | 2017-08-03 16:04:57 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-08-03 16:04:57 +0000 |
| commit | 8ca1ed02fc3392f0d9f300344da6ca315c391135 (patch) | |
| tree | 2c1a02d8e00a8e2ca6da5543583f9157d7636d1f | |
| parent | be9b77358cc8d5975cb3cac58ffd2cc3a7e0f17d (diff) | |
| parent | 05943f689e8054a9c375ba0113ff031dfa389806 (diff) | |
| download | Car-8ca1ed02fc3392f0d9f300344da6ca315c391135.tar.gz | |
Reland "Car: remove use of -static hidl java" am: 14f54c5d63
am: 05943f689e
Change-Id: I95d41a8df000fc352ac4c645368773ab6e9e88a7
| -rw-r--r-- | service/Android.mk | 10 | ||||
| -rw-r--r-- | tests/EmbeddedKitchenSinkApp/Android.mk | 3 | ||||
| -rw-r--r-- | tests/android_car_api_test/Android.mk | 3 | ||||
| -rw-r--r-- | tests/vehiclehal_test/Android.mk | 5 | ||||
| -rw-r--r-- | vehicle-hal-support-lib/Android.mk | 5 |
5 files changed, 16 insertions, 10 deletions
diff --git a/service/Android.mk b/service/Android.mk index 46bb9da1b5..9bd5e124a5 100644 --- a/service/Android.mk +++ b/service/Android.mk @@ -38,8 +38,9 @@ LOCAL_PROGUARD_ENABLED := disabled 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_MODULE := car-service-lib-for-test 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 d6619022ed..37c79f75a3 100644 --- a/tests/EmbeddedKitchenSinkApp/Android.mk +++ b/tests/EmbeddedKitchenSinkApp/Android.mk @@ -40,7 +40,8 @@ LOCAL_PROGUARD_ENABLED := disabled 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 306a240f51..58a12885c8 100644 --- a/tests/android_car_api_test/Android.mk +++ b/tests/android_car_api_test/Android.mk @@ -35,7 +35,8 @@ LOCAL_PROGUARD_ENABLED := disabled 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 43aa41f484..a22ee1b301 100644 --- a/tests/vehiclehal_test/Android.mk +++ b/tests/vehiclehal_test/Android.mk @@ -33,8 +33,9 @@ LOCAL_PROGUARD_ENABLED := disabled 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 638e5cf26e..9ff39c60b8 100644 --- a/vehicle-hal-support-lib/Android.mk +++ b/vehicle-hal-support-lib/Android.mk @@ -24,8 +24,9 @@ LOCAL_MODULE_TAGS := optional 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 |