diff options
| author | Bob Badour <bbadour@google.com> | 2021-02-19 00:58:38 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-19 00:58:38 +0000 |
| commit | 9eecfb9718ca9f68ce446efa0252774dad404f87 (patch) | |
| tree | 4a3a64db478145c11b5b09dc186e6648edf8cae9 | |
| parent | 59cc43a5dc8f68b621ec522894fbc99eb2509b6b (diff) | |
| parent | 9092377440d80ff78f5e263e43187ffc779f69ae (diff) | |
| download | wlan-9eecfb9718ca9f68ce446efa0252774dad404f87.tar.gz | |
Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/broadcom/wlan" am: 9092377440
Original change: https://android-review.googlesource.com/c/platform/hardware/broadcom/wlan/+/1588477
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic043db0083e4ee605cc75488c6b8acbc57b7c5e8
| -rw-r--r-- | bcmdhd/dhdutil/Android.mk | 3 | ||||
| -rwxr-xr-x | bcmdhd/wifi_hal/Android.mk | 3 | ||||
| -rw-r--r-- | bcmdhd/wpa_supplicant_8_lib/Android.mk | 3 |
3 files changed, 8 insertions, 1 deletions
diff --git a/bcmdhd/dhdutil/Android.mk b/bcmdhd/dhdutil/Android.mk index 2385abd..c7e7fdc 100644 --- a/bcmdhd/dhdutil/Android.mk +++ b/bcmdhd/dhdutil/Android.mk @@ -26,6 +26,9 @@ LOCAL_SRC_FILES := \ miniopt.c LOCAL_MODULE := dhdutil +LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD SPDX-license-identifier-ISC +LOCAL_LICENSE_CONDITIONS := notice +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE LOCAL_CFLAGS := -DSDTEST -DTARGETENV_android -Dlinux -DLINUX ifeq ($(TARGET_ARCH),arm) LOCAL_CFLAGS += -mabi=aapcs-linux diff --git a/bcmdhd/wifi_hal/Android.mk b/bcmdhd/wifi_hal/Android.mk index 5763789..6b79524 100755 --- a/bcmdhd/wifi_hal/Android.mk +++ b/bcmdhd/wifi_hal/Android.mk @@ -53,7 +53,8 @@ LOCAL_SRC_FILES := \ wifi_offload.cpp LOCAL_MODULE := libwifi-hal-bcm +LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 +LOCAL_LICENSE_CONDITIONS := notice LOCAL_PROPRIETARY_MODULE := true include $(BUILD_STATIC_LIBRARY) - diff --git a/bcmdhd/wpa_supplicant_8_lib/Android.mk b/bcmdhd/wpa_supplicant_8_lib/Android.mk index 518f0ca..448a7ca 100644 --- a/bcmdhd/wpa_supplicant_8_lib/Android.mk +++ b/bcmdhd/wpa_supplicant_8_lib/Android.mk @@ -66,6 +66,9 @@ L_CFLAGS += -Wall -Werror -Wno-unused-parameter -Wno-macro-redefined include $(CLEAR_VARS) LOCAL_MODULE := lib_driver_cmd_bcmdhd +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) LOCAL_SRC_FILES := $(WPA_SRC_FILE) |