Convert Android.mk to Android.bp

This commit converts Android.mk to Android.bp.

Besides, during the transition, we found that $(wificond_cpp_flags)
should be $(wifi_system_cflags).

Bug: 37429084
Test: Sailfish builds, boots, and wifi works.
Change-Id: Ida255cd6ac0cd9434bd95f1ae570683dccb0388e

3 files changed, 94 insertions, 76 deletions

diff --git a/Android.bp b/Android.bp
new file mode 100644
index 000000000..60aff26de
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,17 @@
+// 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.
+
+subdirs = [
+    "libwifi_system",
+]
diff --git a/libwifi_system/Android.bp b/libwifi_system/Android.bp
new file mode 100644
index 000000000..edc84dfc1
--- /dev/null
+++ b/libwifi_system/Android.bp
@@ -0,0 +1,77 @@
+// Copyright (C) 2016 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.
+
+cc_defaults {
+    name: "libwifi-system-defaults",
+    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",
+    defaults: ["libwifi-system-defaults"],
+    export_include_dirs: ["include"],
+    export_shared_lib_headers: ["libbase"],
+    shared_libs: [
+        "libbase",
+        "libcrypto",
+        "libcutils",
+    ],
+    srcs: [
+        "hostapd_manager.cpp",
+        "interface_tool.cpp",
+        "supplicant_manager.cpp",
+    ],
+}
+
+// Test utilities (e.g. mock classes) for libwifi-system
+// ============================================================
+cc_library_static {
+    name: "libwifi-system-test",
+    defaults: ["libwifi-system-defaults"],
+    static_libs: ["libgmock"],
+    export_include_dirs: [
+        "include",
+        "testlib/include",
+    ],
+}
+
+// Unit tests for libwifi-system
+// ============================================================
+cc_test {
+    name: "libwifi-system_tests",
+    defaults: ["libwifi-system-defaults"],
+    srcs: [
+        "tests/main.cpp",
+        "tests/hostapd_manager_unittest.cpp",
+    ],
+    static_libs: [
+        "libgmock",
+    ],
+    shared_libs: [
+        "libbase",
+        "libwifi-system",
+    ],
+}
diff --git a/libwifi_system/Android.mk b/libwifi_system/Android.mk
deleted file mode 100644
index 554186788..000000000
--- a/libwifi_system/Android.mk
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright (C) 2016 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.
-
-LOCAL_PATH := $(call my-dir)
-
-wifi_system_cflags := \
-    -Wall \
-    -Werror \
-    -Wextra \
-    -Winit-self \
-    -Wno-unused-function \
-    -Wno-unused-parameter \
-    -Wshadow \
-    -Wunused-variable \
-    -Wwrite-strings
-
-# Device independent wifi system logic.
-# ============================================================
-include $(CLEAR_VARS)
-LOCAL_MODULE := libwifi-system
-LOCAL_CFLAGS := $(wifi_system_cflags)
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
-LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
-LOCAL_EXPORT_SHARED_LIBRARY_HEADERS := libbase
-LOCAL_SHARED_LIBRARIES := \
-    libbase \
-    libcrypto \
-    libcutils
-
-LOCAL_SRC_FILES := \
-    hostapd_manager.cpp \
-    interface_tool.cpp \
-    supplicant_manager.cpp
-include $(BUILD_SHARED_LIBRARY)
-
-# Test utilities (e.g. mock classes) for libwifi-system
-# ============================================================
-include $(CLEAR_VARS)
-LOCAL_MODULE := libwifi-system-test
-LOCAL_CFLAGS := $(wifi_system_cflags)
-LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH)/include \
-    $(LOCAL_PATH)/testlib/include
-LOCAL_STATIC_LIBRARIES := libgmock
-LOCAL_EXPORT_C_INCLUDE_DIRS := \
-    $(LOCAL_PATH)/include \
-    $(LOCAL_PATH)/testlib/include
-include $(BUILD_STATIC_LIBRARY)
-
-
-# Unit tests for libwifi-system
-# ============================================================
-include $(CLEAR_VARS)
-LOCAL_MODULE := libwifi-system_tests
-LOCAL_CPPFLAGS := $(wificond_cpp_flags)
-LOCAL_SRC_FILES := \
-    tests/main.cpp \
-    tests/hostapd_manager_unittest.cpp
-LOCAL_STATIC_LIBRARIES := \
-    libgmock \
-    libgtest
-LOCAL_SHARED_LIBRARIES := \
-    libbase \
-    libwifi-system
-include $(BUILD_NATIVE_TEST)