diff options
| author | Roshan Pius <rpius@google.com> | 2017-03-09 17:35:06 -0800 |
|---|---|---|
| committer | Roshan Pius <rpius@google.com> | 2017-03-10 08:41:48 -0800 |
| commit | 22a6563da9439798fa2a3bcbcd6e5ff16945afa8 (patch) | |
| tree | abc953403058ce0a9361b89954fcdb0bfdad7e8e | |
| parent | 6b04563db1b9bf5cedd866e0592f4c1e77dde109 (diff) | |
HalTool: Move haltool out of libwifi-system
HalTool is used mainly by test tools and needs to link against
libwifi-hal. So, move this out of libwifi-system to libwifi-hal.
The libwifi-hal folder will get moved out to hardware/interfaces soon.
Bug: 34457880
Test: Compiles & device boots up.
Change-Id: I00ce0ed2c271e8c4e1295d004d0b7479365cb8d7
| -rw-r--r-- | libwifi_hal/Android.mk | 3 | ||||
| -rw-r--r-- | libwifi_hal/hal_tool.cpp (renamed from libwifi_system/hal_tool.cpp) | 2 | ||||
| -rw-r--r-- | libwifi_hal/include/wifi_hal/hal_tool.h (renamed from libwifi_system/include/wifi_system/hal_tool.h) | 0 | ||||
| -rw-r--r-- | libwifi_system/Android.mk | 4 |
4 files changed, 4 insertions, 5 deletions
diff --git a/libwifi_hal/Android.mk b/libwifi_hal/Android.mk index 5fba6ac7f..3199fd58d 100644 --- a/libwifi_hal/Android.mk +++ b/libwifi_hal/Android.mk @@ -113,7 +113,8 @@ LOCAL_SHARED_LIBRARIES := \ libnl \ libutils LOCAL_SRC_FILES := \ - driver_tool.cpp + driver_tool.cpp \ + hal_tool.cpp LOCAL_WHOLE_STATIC_LIBRARIES := $(LIB_WIFI_HAL) libwifi-hal-common include $(BUILD_SHARED_LIBRARY) diff --git a/libwifi_system/hal_tool.cpp b/libwifi_hal/hal_tool.cpp index 15e3b6f20..76b57aaa2 100644 --- a/libwifi_system/hal_tool.cpp +++ b/libwifi_hal/hal_tool.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "wifi_system/hal_tool.h" +#include "wifi_hal/hal_tool.h" #include <android-base/logging.h> diff --git a/libwifi_system/include/wifi_system/hal_tool.h b/libwifi_hal/include/wifi_hal/hal_tool.h index b25893e15..b25893e15 100644 --- a/libwifi_system/include/wifi_system/hal_tool.h +++ b/libwifi_hal/include/wifi_hal/hal_tool.h diff --git a/libwifi_system/Android.mk b/libwifi_system/Android.mk index 38717e161..6b7f83384 100644 --- a/libwifi_system/Android.mk +++ b/libwifi_system/Android.mk @@ -39,8 +39,7 @@ LOCAL_SHARED_LIBRARIES := \ libcutils \ liblog \ libnetutils \ - libnl \ - libwifi-hal + libnl # Tolerate certain emulators which apparently don't have supplicant installed. ifdef WPA_SUPPLICANT_VERSION @@ -51,7 +50,6 @@ endif LOCAL_SRC_FILES := \ hostapd_manager.cpp \ interface_tool.cpp \ - hal_tool.cpp \ supplicant_manager.cpp \ wifi.cpp include $(BUILD_SHARED_LIBRARY) |