diff options
| author | Steven Moreland <smoreland@google.com> | 2017-08-02 20:41:36 +0000 |
|---|---|---|
| committer | Steven Moreland <smoreland@google.com> | 2017-08-02 14:01:31 -0700 |
| commit | 14f54c5d63c72ae99542cdfc13e8a6271f4780a2 (patch) | |
| tree | c158ef66265f09c8dc363a162ad9df718e0e694b /tests/vehiclehal_test | |
| parent | a8cc03920111dd3150f313269125849b01b01058 (diff) | |
| download | Car-14f54c5d63c72ae99542cdfc13e8a6271f4780a2.tar.gz | |
Reland "Car: remove use of -static hidl java"
This reverts commit a8cc03920111dd3150f313269125849b01b01058.
Note, need to add base dependencies because they
aren't available by default in all branches and the
"java-static" libraries originally included them.
Test: no link errors
Bug: 36376126
Change-Id: I9423a53524e5b3d5f54d8ec7376774f6ab21eb0e
Diffstat (limited to 'tests/vehiclehal_test')
| -rw-r--r-- | tests/vehiclehal_test/Android.mk | 5 |
1 files changed, 3 insertions, 2 deletions
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 |