Convert Android.mk file to Android.bp am: d23e29c24c am: d665ed6d10

am: 008d0d85c4

Change-Id: Ie3890b6a3f1e746f37187d87322dfb6648496427

2 files changed, 85 insertions, 77 deletions

diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..38f8463
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,85 @@
+// 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: "libwifilogd_flags",
+    cflags: [
+        "-Wall",
+        "-Wextra",
+        "-Weffc++",
+        "-Weverything",
+        "-Wno-c++98-compat",
+        "-Wno-c++98-compat-pedantic",
+        "-Wno-padded",
+        "-Werror",
+
+    ],
+    include_dirs: ["system/connectivity"],
+    shared_libs: [
+        "libbase",
+        "libcutils",
+        "liblog",
+    ],
+
+}
+
+// wifilogd static library
+cc_library_static {
+    name: "libwifilogd",
+    srcs: [
+        "command_processor.cpp",
+        "main_loop.cpp",
+        "memory_reader.cpp",
+        "message_buffer.cpp",
+        "os.cpp",
+        "raw_os.cpp",
+    ],
+    defaults: ["libwifilogd_flags"],
+}
+
+// wifilogd unit tests.
+cc_test {
+    name: "wifilogd_unit_test",
+    test_suites: ["device-tests"],
+    defaults: ["libwifilogd_flags"],
+    cppflags: [
+        "-Wno-undef",
+        "-Wno-missing-noreturn",
+        "-Wno-shift-sign-overflow",
+        "-Wno-used-but-marked-unused",
+        "-Wno-deprecated",
+        "-Wno-weak-vtables",
+        "-Wno-sign-conversion",
+        "-Wno-global-constructors",
+        "-Wno-covered-switch-default",
+    ],
+    srcs: [
+        "tests/byte_buffer_unittest.cpp",
+        "tests/command_processor_unittest.cpp",
+        "tests/local_utils_unittest.cpp",
+        "tests/main.cpp",
+        "tests/main_loop_unittest.cpp",
+        "tests/memory_reader_unittest.cpp",
+        "tests/message_buffer_unittest.cpp",
+        "tests/mock_command_processor.cpp",
+        "tests/mock_os.cpp",
+        "tests/mock_raw_os.cpp",
+        "tests/os_unittest.cpp",
+        "tests/protocol_unittest.cpp",
+    ],
+    static_libs: [
+        "libgmock",
+        "libwifilogd",
+    ],
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 60bd504..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,77 +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)
-wifilogd_cpp_flags := -Wall -Wextra -Weffc++ -Weverything \
-    -Wno-c++98-compat -Wno-c++98-compat-pedantic -Wno-padded -Werror
-wifilogd_gtest_cpp_flags := -Wno-undef -Wno-missing-noreturn \
-    -Wno-shift-sign-overflow -Wno-used-but-marked-unused -Wno-deprecated \
-    -Wno-weak-vtables -Wno-sign-conversion -Wno-global-constructors \
-    -Wno-covered-switch-default
-
-wifilogd_parent_dir := $(LOCAL_PATH)/../
-wifilogd_includes := \
-    $(wifilogd_parent_dir)
-
-###
-### wifilogd static library
-###
-include $(CLEAR_VARS)
-LOCAL_MODULE := libwifilogd
-LOCAL_CPPFLAGS := $(wifilogd_cpp_flags)
-LOCAL_C_INCLUDES := $(wifilogd_includes)
-LOCAL_SRC_FILES := \
-    command_processor.cpp \
-    main_loop.cpp \
-    memory_reader.cpp \
-    message_buffer.cpp \
-    os.cpp \
-    raw_os.cpp
-LOCAL_SHARED_LIBRARIES := \
-    libbase \
-    libcutils \
-    liblog
-include $(BUILD_STATIC_LIBRARY)
-
-###
-### wifilogd unit tests.
-###
-include $(CLEAR_VARS)
-LOCAL_MODULE := wifilogd_unit_test
-LOCAL_COMPATIBILITY_SUITE := device-tests
-LOCAL_CPPFLAGS := $(wifilogd_cpp_flags) $(wifilogd_gtest_cpp_flags)
-
-LOCAL_C_INCLUDES := $(wifilogd_includes)
-LOCAL_SRC_FILES := \
-    tests/byte_buffer_unittest.cpp \
-    tests/command_processor_unittest.cpp \
-    tests/local_utils_unittest.cpp \
-    tests/main.cpp \
-    tests/main_loop_unittest.cpp \
-    tests/memory_reader_unittest.cpp \
-    tests/message_buffer_unittest.cpp \
-    tests/mock_command_processor.cpp \
-    tests/mock_os.cpp \
-    tests/mock_raw_os.cpp \
-    tests/os_unittest.cpp \
-    tests/protocol_unittest.cpp
-LOCAL_STATIC_LIBRARIES := \
-    libgmock \
-    libgtest \
-    libwifilogd
-LOCAL_SHARED_LIBRARIES := \
-    libbase \
-    libcutils \
-    liblog
-include $(BUILD_NATIVE_TEST)