From ea8794ebe891e5b8a690dde9444f260359c1cfe7 Mon Sep 17 00:00:00 2001
From: David Marble <drmarble1@gmail.com>
Date: Thu, 30 Nov 2023 12:35:36 -0600
Subject: [PATCH] realtek/wlan/wifi_hal: Migrate to Blueprint

Change-Id: I662d45fab8db97656534b4162298fa4e9f7af418
---
 wlan/wifi_hal/Android.bp | 40 +++++++++++++++++++++++++++++++
 wlan/wifi_hal/Android.mk | 52 ----------------------------------------
 2 files changed, 40 insertions(+), 52 deletions(-)
 create mode 100644 wlan/wifi_hal/Android.bp
 delete mode 100644 wlan/wifi_hal/Android.mk

diff --git a/wlan/wifi_hal/Android.bp b/wlan/wifi_hal/Android.bp
new file mode 100644
index 0000000..2bc9cbb
--- /dev/null
+++ b/wlan/wifi_hal/Android.bp
@@ -0,0 +1,40 @@
+//
+// Copyright (C) 2023 The LineageOS Project
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+
+
+cc_library_static {
+    name: "libwifi-hal-rtk",
+    vendor_available: true,
+    compile_multilib: "both",
+    srcs: [
+        "rtw_wifi_hal.cpp",
+        "rtw_wifi_rtt.cpp",
+        "common.cpp",
+        "cpp_bindings.cpp",
+        "rtw_wifi_gscan.cpp",
+        "rtw_wifi_llstats.cpp",
+        "rtw_wifi_logger.cpp",
+        "rtw_wifi_offload.cpp",
+    ],
+
+    include_dirs: [
+        "external/libnl/include",
+        "hardware/libhardware_legacy/include/hardware_legacy",
+        "external/wpa_supplicant_8/src/drivers",
+    ],
+
+    cflags: ["-Wno-unused-parameter",
+        "-Wall" ,
+        "-Werror",
+        "-Wno-format",
+        "-Wno-reorder",
+        "-Wno-unused-function",
+        "-Wno-unused-parameter",
+        "-Wno-unused-private-field",
+        "-Wno-unused-variable",
+    ],
+    header_libs: ["libutils_headers", "liblog_headers"],
+}
diff --git a/wlan/wifi_hal/Android.mk b/wlan/wifi_hal/Android.mk
deleted file mode 100644
index 43683c8..0000000
--- a/wlan/wifi_hal/Android.mk
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright (C) 2011 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)
-
-# Make the HAL library
-# ============================================================
-include $(CLEAR_VARS)
-
-LOCAL_CFLAGS := \
-    -Wall \
-    -Werror \
-    -Wno-format \
-    -Wno-reorder \
-    -Wno-unused-function \
-    -Wno-unused-parameter \
-    -Wno-unused-private-field \
-    -Wno-unused-variable 
-#    -DCONFIG_WIFI_HAL_DEBUG
-
-LOCAL_C_INCLUDES += \
-	external/libnl/include \
-	$(call include-path-for, libhardware_legacy)/hardware_legacy \
-	external/wpa_supplicant_8/src/drivers
-
-LOCAL_HEADER_LIBRARIES := libutils_headers liblog_headers
-LOCAL_SRC_FILES := \
-	rtw_wifi_hal.cpp \
-	rtw_wifi_rtt.cpp \
-	common.cpp \
-	cpp_bindings.cpp \
-	rtw_wifi_gscan.cpp \
-	rtw_wifi_llstats.cpp \
-	rtw_wifi_logger.cpp \
-	rtw_wifi_offload.cpp
-
-LOCAL_MODULE := libwifi-hal-rtk
-LOCAL_PROPRIETARY_MODULE := true
-
-include $(BUILD_STATIC_LIBRARY)
-
-- 
2.20.1