From 8e2f6a5cddcefc92d1e1797bc2014d2666eeafe0 Mon Sep 17 00:00:00 2001
From: Sohani Rao <sohanirao@google.com>
Date: Thu, 6 Apr 2017 18:13:28 -0700
Subject: [PATCH] Replace make file with soong

For WifiOffload HAL, comply with soong format

Test: VTS test
Bug: 32842314
Change-Id: I1af37efd20e3dc75bc40b8a7fa4f19b428c6f232
---
 Android.bp              |  1 +
 wifi_offload/Android.bp | 32 ++++++++++++++++++++++++++++++++
 wifi_offload/Android.mk | 35 -----------------------------------
 3 files changed, 33 insertions(+), 35 deletions(-)
 create mode 100644 wifi_offload/Android.bp
 delete mode 100644 wifi_offload/Android.mk

diff --git a/Android.bp b/Android.bp
index e4aee1c5..9150b0ef 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,5 @@
 subdirs = [
     "vr",
     "vibrator",
+    "wifi_offload",
 ]
diff --git a/wifi_offload/Android.bp b/wifi_offload/Android.bp
new file mode 100644
index 00000000..a2dd4ab0
--- /dev/null
+++ b/wifi_offload/Android.bp
@@ -0,0 +1,32 @@
+//
+// 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.
+
+cc_binary {
+    name: "android.hardware.wifi.offload@1.0-service",
+    relative_install_path: "hw",
+    init_rc: ["android.hardware.wifi.offload@1.0-service.rc"],
+    srcs: ["Offload.cpp", "service.cpp"],
+    cflags: ["-Wall", "-Wextra"],
+    shared_libs: [
+        "libbase",
+        "libhidlbase",
+        "libhidltransport",
+        "liblog",
+        "libutils",
+        "android.hardware.wifi.offload@1.0",
+    ],
+    proprietary: true,
+}
+
diff --git a/wifi_offload/Android.mk b/wifi_offload/Android.mk
deleted file mode 100644
index 95fe150a..00000000
--- a/wifi_offload/Android.mk
+++ /dev/null
@@ -1,35 +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)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := android.hardware.wifi.offload@1.0-service
-LOCAL_MODULE_RELATIVE_PATH := hw
-LOCAL_PROPRIETARY_MODULE := true
-LOCAL_CPPFLAGS := -Wall -Werror -Wextra
-LOCAL_SRC_FILES := \
-    Offload.cpp \
-    service.cpp
-LOCAL_SHARED_LIBRARIES := \
-    android.hardware.wifi.offload@1.0 \
-    libbase \
-    libcutils \
-    libhidlbase \
-    libhidltransport \
-    liblog \
-    libutils
-LOCAL_INIT_RC := android.hardware.wifi.offload@1.0-service.rc
-include $(BUILD_EXECUTABLE)
-
-