diff options
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2021-03-04 01:10:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-03-04 01:10:30 +0000 |
| commit | 374ace7a728487f3e0cb673bb94d11787528d41f (patch) | |
| tree | 4a3a64db478145c11b5b09dc186e6648edf8cae9 | |
| parent | c659e6ff69b797eafe95f5f1872932cfc1d7da22 (diff) | |
| parent | 123103e60d236369ca3727b65588c2d554309fd4 (diff) | |
| download | wlan-platform-tools-31.0.3.tar.gz | |
Merge "Snap for 7183507 from 7156ae41351b5d56ef3206ca642c52da985481e6 to sdk-release" into sdk-releaseplatform-tools-31.0.3platform-tools-31.0.2platform-tools-31.0.1
| -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) |