diff options
| author | Bob Badour <bbadour@google.com> | 2021-02-16 23:02:14 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-16 23:02:14 +0000 |
| commit | e8566b0416afdfbfce0e7017c78084943ac874e9 (patch) | |
| tree | ab8d1553803ae311091b4da6a4dfda93cb5ab46b /wpa_supplicant | |
| parent | 18c583556aaf267c8167234faac78b7b7e15b062 (diff) | |
| parent | a1905fcdf9da7d0256b3e93bd92e718bc03c7aed (diff) | |
| download | wpa_supplicant_8-e8566b0416afdfbfce0e7017c78084943ac874e9.tar.gz | |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/wpa_supplicant_8" am: 0c27f83d73 am: 496aae6d74 am: a1905fcdf9
Original change: https://android-review.googlesource.com/c/platform/external/wpa_supplicant_8/+/1588869
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I80e9a77241873f23f121fab178a8b57256634d15
Diffstat (limited to 'wpa_supplicant')
| -rw-r--r-- | wpa_supplicant/Android.mk | 12 | ||||
| -rw-r--r-- | wpa_supplicant/wpa_supplicant_conf.mk | 3 |
2 files changed, 15 insertions, 0 deletions
diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk index 154492f8..2a171f66 100644 --- a/wpa_supplicant/Android.mk +++ b/wpa_supplicant/Android.mk @@ -1714,6 +1714,9 @@ endif include $(CLEAR_VARS) LOCAL_MODULE := wpa_cli +LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD SPDX-license-identifier-BSD-3-Clause SPDX-license-identifier-ISC legacy_unencumbered +LOCAL_LICENSE_CONDITIONS := notice unencumbered +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYING $(LOCAL_PATH)/../NOTICE LOCAL_PROPRIETARY_MODULE := true LOCAL_SHARED_LIBRARIES := libc libcutils liblog LOCAL_CFLAGS := $(L_CFLAGS) @@ -1724,6 +1727,9 @@ include $(BUILD_EXECUTABLE) ######################## include $(CLEAR_VARS) LOCAL_MODULE := wpa_supplicant +LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD SPDX-license-identifier-BSD-3-Clause SPDX-license-identifier-ISC legacy_unencumbered +LOCAL_LICENSE_CONDITIONS := notice unencumbered +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYING $(LOCAL_PATH)/../NOTICE LOCAL_PROPRIETARY_MODULE := true LOCAL_MODULE_RELATIVE_PATH := hw ifdef CONFIG_DRIVER_CUSTOM @@ -1801,6 +1807,9 @@ include $(BUILD_EXECUTABLE) include $(CLEAR_VARS) LOCAL_MODULE = libwpa_client +LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD SPDX-license-identifier-BSD-3-Clause SPDX-license-identifier-ISC legacy_unencumbered +LOCAL_LICENSE_CONDITIONS := notice unencumbered +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYING $(LOCAL_PATH)/../NOTICE LOCAL_PROPRIETARY_MODULE := true LOCAL_CFLAGS = $(L_CFLAGS) LOCAL_SRC_FILES = src/common/wpa_ctrl.c src/utils/os_$(CONFIG_OS).c @@ -1814,6 +1823,9 @@ ifeq ($(WPA_SUPPLICANT_USE_HIDL), y) ######################## include $(CLEAR_VARS) LOCAL_MODULE := libwpa_hidl +LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD SPDX-license-identifier-BSD-3-Clause SPDX-license-identifier-ISC legacy_unencumbered +LOCAL_LICENSE_CONDITIONS := notice unencumbered +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYING $(LOCAL_PATH)/../NOTICE LOCAL_VENDOR_MODULE := true LOCAL_CPPFLAGS := $(L_CPPFLAGS) LOCAL_CFLAGS := $(L_CFLAGS) diff --git a/wpa_supplicant/wpa_supplicant_conf.mk b/wpa_supplicant/wpa_supplicant_conf.mk index 42939762..ac594b68 100644 --- a/wpa_supplicant/wpa_supplicant_conf.mk +++ b/wpa_supplicant/wpa_supplicant_conf.mk @@ -14,6 +14,9 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := wpa_supplicant.conf +LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD SPDX-license-identifier-BSD-3-Clause SPDX-license-identifier-ISC legacy_unencumbered +LOCAL_LICENSE_CONDITIONS := notice unencumbered +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYING $(LOCAL_PATH)/../NOTICE LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_TAGS := optional LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/etc/wifi |