diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2021-02-21 00:07:40 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-02-21 00:07:40 +0000 |
| commit | 247462ffde76cf0b685c9f45c95e3b4b73e89c79 (patch) | |
| tree | 40ab41386df11076454838f4954937d89bfad490 | |
| parent | 92dbec7a0e14c0b486b5c420726377bde8dd1792 (diff) | |
| parent | eaced58314bed2412714bf0e0f5680c90f856add (diff) | |
| download | wlan-247462ffde76cf0b685c9f45c95e3b4b73e89c79.tar.gz | |
Snap for 7160059 from eaced58314bed2412714bf0e0f5680c90f856add to sc-v2-release
Change-Id: Ib2d04cce7a99840e9882458db3bac48dc09791fd
| -rw-r--r-- | cld80211-lib/Android.mk | 3 | ||||
| -rw-r--r-- | qcwcn/wcnss-service/Android.mk | 2 | ||||
| -rw-r--r-- | qcwcn/wifi_hal/Android.mk | 8 | ||||
| -rw-r--r-- | qcwcn/wpa_supplicant_8_lib/Android.mk | 3 |
4 files changed, 15 insertions, 1 deletions
diff --git a/cld80211-lib/Android.mk b/cld80211-lib/Android.mk index 76d49fb..e97917a 100644 --- a/cld80211-lib/Android.mk +++ b/cld80211-lib/Android.mk @@ -2,6 +2,8 @@ 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) \ @@ -12,4 +14,3 @@ LOCAL_CFLAGS += -Wall -Werror -Wno-unused-parameter LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH) LOCAL_VENDOR_MODULE := true include $(BUILD_SHARED_LIBRARY) - diff --git a/qcwcn/wcnss-service/Android.mk b/qcwcn/wcnss-service/Android.mk index 53355dc..0425563 100644 --- a/qcwcn/wcnss-service/Android.mk +++ b/qcwcn/wcnss-service/Android.mk @@ -3,6 +3,8 @@ ifneq (,$(filter arm aarch64 arm64, $(TARGET_ARCH))) LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := wcnss_service +LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD +LOCAL_LICENSE_CONDITIONS := notice LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/common/inc/ LOCAL_SRC_FILES := wcnss_service.c LOCAL_PROPRIETARY_MODULE := true diff --git a/qcwcn/wifi_hal/Android.mk b/qcwcn/wifi_hal/Android.mk index 5c77639..5761e5b 100644 --- a/qcwcn/wifi_hal/Android.mk +++ b/qcwcn/wifi_hal/Android.mk @@ -21,6 +21,8 @@ include $(CLEAR_VARS) LOCAL_CFLAGS := -Wno-unused-parameter LOCAL_CFLAGS += -Wall -Werror LOCAL_MODULE := libwifi-hal-ctrl +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD +LOCAL_LICENSE_CONDITIONS := notice LOCAL_VENDOR_MODULE := true LOCAL_C_INCLUDES := $(LOCAL_PATH)/wifi_hal_ctrl LOCAL_SRC_FILES := wifi_hal_ctrl/wifi_hal_ctrl.c @@ -29,6 +31,8 @@ include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) LOCAL_MODULE := libwifi-hal-ctrl_headers +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD +LOCAL_LICENSE_CONDITIONS := notice LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/wifi_hal_ctrl LOCAL_HEADER_LIBRARIES := libcutils_headers include $(BUILD_HEADER_LIBRARY) @@ -89,6 +93,8 @@ LOCAL_SRC_FILES := \ radio_mode.cpp LOCAL_MODULE := libwifi-hal-qcom +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD +LOCAL_LICENSE_CONDITIONS := notice LOCAL_VENDOR_MODULE := true LOCAL_CLANG := true LOCAL_SHARED_LIBRARIES += libnetutils liblog libwpa_client libcld80211 @@ -161,6 +167,8 @@ LOCAL_SRC_FILES := \ LOCAL_CFLAGS += -Wall -Werror LOCAL_MODULE := libwifi-hal-qcom +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD +LOCAL_LICENSE_CONDITIONS := notice LOCAL_VENDOR_MODULE := true LOCAL_CLANG := true LOCAL_SHARED_LIBRARIES += libnetutils liblog diff --git a/qcwcn/wpa_supplicant_8_lib/Android.mk b/qcwcn/wpa_supplicant_8_lib/Android.mk index 91926b2..e756800 100644 --- a/qcwcn/wpa_supplicant_8_lib/Android.mk +++ b/qcwcn/wpa_supplicant_8_lib/Android.mk @@ -58,6 +58,9 @@ L_CFLAGS += -Werror include $(CLEAR_VARS) LOCAL_MODULE := lib_driver_cmd_qcwcn +LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE LOCAL_SHARED_LIBRARIES := libc libcutils LOCAL_CFLAGS := $(L_CFLAGS) -Wall LOCAL_SRC_FILES := $(WPA_SRC_FILE) |