diff options
| -rw-r--r-- | Android.bp | 1 | ||||
| -rw-r--r-- | libwifi_system/Android.bp | 1 | ||||
| -rw-r--r-- | libwifi_system_iface/Android.bp | 58 | ||||
| -rw-r--r-- | libwifi_system_iface/include/wifi_system/interface_tool.h (renamed from libwifi_system/include/wifi_system/interface_tool.h) | 0 | ||||
| -rw-r--r-- | libwifi_system_iface/interface_tool.cpp (renamed from libwifi_system/interface_tool.cpp) | 0 | ||||
| -rw-r--r-- | libwifi_system_iface/testlib/include/wifi_system_test/mock_interface_tool.h (renamed from libwifi_system/testlib/include/wifi_system_test/mock_interface_tool.h) | 0 |
6 files changed, 59 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp index 60aff26de..ca791257a 100644 --- a/Android.bp +++ b/Android.bp @@ -14,4 +14,5 @@ subdirs = [ "libwifi_system", + "libwifi_system_iface", ] diff --git a/libwifi_system/Android.bp b/libwifi_system/Android.bp index edc84dfc1..877d05f1d 100644 --- a/libwifi_system/Android.bp +++ b/libwifi_system/Android.bp @@ -41,7 +41,6 @@ cc_library_shared { ], srcs: [ "hostapd_manager.cpp", - "interface_tool.cpp", "supplicant_manager.cpp", ], } diff --git a/libwifi_system_iface/Android.bp b/libwifi_system_iface/Android.bp new file mode 100644 index 000000000..4be0aa01c --- /dev/null +++ b/libwifi_system_iface/Android.bp @@ -0,0 +1,58 @@ +// Copyright (C) 2017 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +wifi_system_iface_cflags = [ + "-Wall", + "-Werror", + "-Wextra", + "-Winit-self", + "-Wno-unused-function", + "-Wno-unused-parameter", + "-Wshadow", + "-Wunused-variable", + "-Wwrite-strings", +] + +// Device independent wifi system logic. +// ============================================================ +cc_library_shared { + name: "libwifi-system-iface", + vendor_available: true, + cflags: wifi_system_iface_cflags, + local_include_dirs: ["include"], + export_include_dirs: ["include"], + shared_libs: [ + "libbase", + ], + + srcs: [ + "interface_tool.cpp", + ], +} + +// Test utilities (e.g. mock classes) for libwifi-system-iface +// ============================================================ +cc_library_static { + name: "libwifi-system-iface-test", + cflags: wifi_system_iface_cflags, + local_include_dirs: [ + "include", + "testlib/include", + ], + static_libs: ["libgmock"], + export_include_dirs: [ + "include", + "testlib/include", + ], +} diff --git a/libwifi_system/include/wifi_system/interface_tool.h b/libwifi_system_iface/include/wifi_system/interface_tool.h index aabdd9a52..aabdd9a52 100644 --- a/libwifi_system/include/wifi_system/interface_tool.h +++ b/libwifi_system_iface/include/wifi_system/interface_tool.h diff --git a/libwifi_system/interface_tool.cpp b/libwifi_system_iface/interface_tool.cpp index f0d40efd4..f0d40efd4 100644 --- a/libwifi_system/interface_tool.cpp +++ b/libwifi_system_iface/interface_tool.cpp diff --git a/libwifi_system/testlib/include/wifi_system_test/mock_interface_tool.h b/libwifi_system_iface/testlib/include/wifi_system_test/mock_interface_tool.h index b9926c938..b9926c938 100644 --- a/libwifi_system/testlib/include/wifi_system_test/mock_interface_tool.h +++ b/libwifi_system_iface/testlib/include/wifi_system_test/mock_interface_tool.h |