summaryrefslogtreecommitdiff
path: root/service
diff options
context:
space:
mode:
authorRoshan Pius <rpius@google.com>2017-05-08 10:25:27 -0700
committerRoshan Pius <rpius@google.com>2017-05-08 13:46:40 -0700
commitf1a963af52a2d722c4a12c57e6775a12453631d7 (patch)
tree7322b869c6b2b3bf90cdee86d41e110a03bde780 /service
parent0cb7ccda98c48bd45af272d2a888220f8b26e1c8 (diff)
wifi: Remove linking against static hidl libraries
Also, link against android.hidl.manager-V1.0-java. We previously relied on usb to statically link against it for framework. Bug: 38036660 Test: Compiles, Device boots up and connects to wifi networks. Change-Id: Ic1edd2181f99657d055df3078c9b03c3115d1926
Diffstat (limited to 'service')
-rw-r--r--service/Android.mk11
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