summaryrefslogtreecommitdiffstats
path: root/service/jni
diff options
context:
space:
mode:
authorChristopher Wiley <wiley@google.com>2016-06-15 13:04:47 -0700
committerChristopher Wiley <wiley@google.com>2016-06-15 15:23:53 -0700
commit94a1844242a3725d9314f2e2dbcdf0ab58b0f1c1 (patch)
tree06d86963d68097bc0c1bb6eebe8a8a563decce9f /service/jni
parent6ce93571aaab3f258789fcb9bb2c667d0c2e0bd5 (diff)
downloadandroid_frameworks_opt_net_wifi-94a1844242a3725d9314f2e2dbcdf0ab58b0f1c1.tar.gz
android_frameworks_opt_net_wifi-94a1844242a3725d9314f2e2dbcdf0ab58b0f1c1.tar.bz2
android_frameworks_opt_net_wifi-94a1844242a3725d9314f2e2dbcdf0ab58b0f1c1.zip
Move wifi.c to libwifi-system
This library will eventually contain only device independent wifi related code. For now, it still takes a few parameters from the build system to control #defines in a device specific way. Bug: 29321445 Change-Id: I6d0054a15b0e448019bb51728763d961132c5464 Test: Compiles, can associate to APs on bullhead, angler
Diffstat (limited to 'service/jni')
-rw-r--r--service/jni/com_android_server_wifi_WifiNative.cpp2
-rw-r--r--service/jni/com_android_server_wifi_nan_WifiNanNative.cpp2
-rw-r--r--service/jni/jni_helper.cpp2
3 files changed, 3 insertions, 3 deletions
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"