diff options
| author | Christopher Wiley <wiley@google.com> | 2016-06-16 15:32:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-06-16 15:32:01 +0000 |
| commit | 051a0607b6b2f1ad058f048e2a104e4ebe36c730 (patch) | |
| tree | 949161b5bba24c21c66cd6b3d6a0567461aa9afd /service | |
| parent | 2d98be357b6fc6b4662ce78e76595b40e39ca211 (diff) | |
| parent | 94a1844242a3725d9314f2e2dbcdf0ab58b0f1c1 (diff) | |
Merge "Move wifi.c to libwifi-system"
Diffstat (limited to 'service')
| -rw-r--r-- | service/Android.mk | 6 | ||||
| -rw-r--r-- | service/jni/com_android_server_wifi_WifiNative.cpp | 2 | ||||
| -rw-r--r-- | service/jni/com_android_server_wifi_nan_WifiNanNative.cpp | 2 | ||||
| -rw-r--r-- | service/jni/jni_helper.cpp | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/service/Android.mk b/service/Android.mk index 827d38cdd..9b3ed1d17 100644 --- a/service/Android.mk +++ b/service/Android.mk @@ -80,7 +80,7 @@ endif # ============================================================ include $(CLEAR_VARS) -LOCAL_REQUIRED_MODULES := libhardware_legacy +LOCAL_REQUIRED_MODULES := libwifi-system LOCAL_CFLAGS += -Wall -Werror -Wextra -Wno-unused-parameter -Wno-unused-function \ -Wunused-variable -Winit-self -Wwrite-strings -Wshadow @@ -97,9 +97,9 @@ LOCAL_SHARED_LIBRARIES += \ libcutils \ libutils \ libhardware \ - libhardware_legacy \ libnl \ - libdl + libdl \ + libwifi-system LOCAL_STATIC_LIBRARIES += libwifi-hal-stub LOCAL_STATIC_LIBRARIES += $(LIB_WIFI_HAL) diff --git a/service/jni/com_android_server_wifi_WifiNative.cpp b/service/jni/com_android_server_wifi_WifiNative.cpp index 71e39714a..7fd7303f9 100644 --- a/service/jni/com_android_server_wifi_WifiNative.cpp +++ b/service/jni/com_android_server_wifi_WifiNative.cpp @@ -34,7 +34,7 @@ #include <limits> #include <vector> -#include "wifi.h" +#include "wifi_system/wifi.h" #include "wifi_hal.h" #include "jni_helper.h" #include "rtt.h" diff --git a/service/jni/com_android_server_wifi_nan_WifiNanNative.cpp b/service/jni/com_android_server_wifi_nan_WifiNanNative.cpp index 8f611420d..d8dce6b1e 100644 --- a/service/jni/com_android_server_wifi_nan_WifiNanNative.cpp +++ b/service/jni/com_android_server_wifi_nan_WifiNanNative.cpp @@ -27,7 +27,7 @@ #include <stdlib.h> #include <sys/socket.h> #include <linux/if.h> -#include "wifi.h" +#include "wifi_system/wifi.h" #include "wifi_hal.h" #include "jni_helper.h" diff --git a/service/jni/jni_helper.cpp b/service/jni/jni_helper.cpp index 40768c6ec..eb4f80cf9 100644 --- a/service/jni/jni_helper.cpp +++ b/service/jni/jni_helper.cpp @@ -23,7 +23,7 @@ #include <utils/Log.h> #include <utils/String16.h> -#include "wifi.h" +#include "wifi_system/wifi.h" #include "wifi_hal.h" #include "jni_helper.h" |