summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoshan Pius <rpius@google.com>2017-05-08 10:25:27 -0700
committerSteven Moreland <smoreland@google.com>2017-08-02 00:24:36 +0000
commita1b2781a9b863721239c8ee512448bfaff5ae6b0 (patch)
treec5f6a36d774738d694170a5cc0b9e189a5891e0c
parentae11287aec4f1e18f6442aed4629180c1fc075fc (diff)
downloadwifi-o-iot-preview-5.tar.gz
wifi: Remove linking against static hidl librariesandroid-o-iot-preview-5o-iot-preview-5
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. Merged-In: Ic1edd2181f99657d055df3078c9b03c3115d1926 Change-Id: Ic1edd2181f99657d055df3078c9b03c3115d1926
-rw-r--r--service/Android.mk15
1 files changed, 10 insertions, 5 deletions
diff --git a/service/Android.mk b/service/Android.mk
index 4ed8ac025..adbb22f6c 100644
--- a/service/Android.mk
+++ b/service/Android.mk
@@ -55,12 +55,17 @@ 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.hidl.base-V1.0-java-static \
- android.hidl.manager-V1.0-java-static
+ android.hardware.wifi-V1.0-java \
+ android.hardware.wifi.supplicant-V1.0-java \
+ android.hidl.base-V1.0-java \
+ android.hidl.manager-V1.0-java
LOCAL_REQUIRED_MODULES := services
LOCAL_MODULE_TAGS :=
LOCAL_MODULE := wifi-service