diff options
| author | Roshan Pius <rpius@google.com> | 2017-05-09 15:47:29 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-05-09 15:47:29 +0000 |
| commit | db4d19b03e6ce8a27dbc6ce9e20e6f2ab543cce6 (patch) | |
| tree | 607027043296d2904f88ca5b9ee3e347fa309a18 | |
| parent | 6c5d03c7e9136523cb48bc9a8ec2deb78dbd49fe (diff) | |
| parent | a7bd6d6f01838d87ea310aade60456ec639c1577 (diff) | |
Merge "wifi: Remove linking against static hidl libraries" into oc-dev
am: a7bd6d6f01
Change-Id: Id0f24176da239b4de8c963b2ff10d04fcfbabfb5
| -rw-r--r-- | service/Android.mk | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/service/Android.mk b/service/Android.mk index 2ef647ef2..b6288be07 100644 --- a/service/Android.mk +++ b/service/Android.mk @@ -55,10 +55,15 @@ LOCAL_SRC_FILES := $(call all-java-files-under, java) \ $(call all-Iaidl-files-under, $(wificond_aidl_rel_path)) \ $(call all-logtags-files-under, java) -LOCAL_JAVA_LIBRARIES := bouncycastle conscrypt jsr305 services +LOCAL_JAVA_LIBRARIES := \ + android.hidl.manager-V1.0-java \ + bouncycastle \ + conscrypt \ + jsr305 \ + services LOCAL_STATIC_JAVA_LIBRARIES := \ - android.hardware.wifi-V1.0-java-static \ - android.hardware.wifi.supplicant-V1.0-java-static + android.hardware.wifi-V1.0-java \ + android.hardware.wifi.supplicant-V1.0-java LOCAL_REQUIRED_MODULES := services LOCAL_MODULE_TAGS := LOCAL_MODULE := wifi-service |