summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKrzysztof KosiƄski <krzysio@google.com>2021-06-15 22:36:41 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2021-06-15 22:36:41 +0000
commit1ece7d8371c3bdbcb4174cfcd3a8d03b036d2c5d (patch)
tree40ab41386df11076454838f4954937d89bfad490
parentffe5476966c41c2a350ad2a45eebe4d8e066bb9a (diff)
parent766ce94b909f21b33ceb675fb38b53d493cb2104 (diff)
downloadwlan-1ece7d8371c3bdbcb4174cfcd3a8d03b036d2c5d.tar.gz
Merge "Revert "Convert cld80211-lib/Android.mk to Android.bp""
-rw-r--r--cld80211-lib/Android.bp28
-rw-r--r--cld80211-lib/Android.mk16
2 files changed, 16 insertions, 28 deletions
diff --git a/cld80211-lib/Android.bp b/cld80211-lib/Android.bp
deleted file mode 100644
index 7aa2f1e..0000000
--- a/cld80211-lib/Android.bp
+++ /dev/null
@@ -1,28 +0,0 @@
-package {
- // See: http://go/android-license-faq
- default_applicable_licenses: ["hardware_qcom_wlan_cld80221-lib_license"],
-}
-
-license {
- name: "hardware_qcom_wlan_cld80221-lib_license",
- visibility: [":__subpackages__"],
- license_kinds: [
- "SPDX-license-identifier-BSD",
- ],
-}
-
-cc_library_shared {
- name: "libcld80211",
- include_dirs: ["external/libnl/include"],
- shared_libs: [
- "libcutils",
- "libnl",
- "liblog",
- ],
- srcs: ["cld80211_lib.c"],
- cflags: [
- "-Wno-unused-parameter",
- ],
- export_include_dirs: ["."],
- vendor: true,
-}
diff --git a/cld80211-lib/Android.mk b/cld80211-lib/Android.mk
new file mode 100644
index 0000000..e97917a
--- /dev/null
+++ b/cld80211-lib/Android.mk
@@ -0,0 +1,16 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libcld80211
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_CLANG := true
+LOCAL_MODULE_TAGS := optional
+LOCAL_C_INCLUDES += $(LOCAL_PATH) \
+ external/libnl/include
+LOCAL_SHARED_LIBRARIES := libcutils libnl liblog
+LOCAL_SRC_FILES := cld80211_lib.c
+LOCAL_CFLAGS += -Wall -Werror -Wno-unused-parameter
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)
+LOCAL_VENDOR_MODULE := true
+include $(BUILD_SHARED_LIBRARY)