Snap for 7149879 from e1a0dd51e59a1bfce4344ee8edbd30bb07341ed2 to sc-v2-release

Change-Id: I59ff24721b71c491ecb2ea54362c20d02f8240bb

3 files changed, 56 insertions, 0 deletions

diff --git a/Android.bp b/Android.bp
index 9624a69b..bda6b4eb 100644
--- a/Android.bp
+++ b/Android.bp
@@ -13,6 +13,44 @@
 // limitations under the License.
 
 // Common variables.
+package {
+    default_applicable_licenses: ["external_libwebsockets_license"],
+}
+
+// Added automatically by a large-scale-change that took the approach of
+// 'apply every license found to every target'. While this makes sure we respect
+// every license restriction, it may not be entirely correct.
+//
+// e.g. GPL in an MIT project might only apply to the contrib/ directory.
+//
+// Please consider splitting the single license below into multiple licenses,
+// taking care not to lose any license_kind information, and overriding the
+// default license using the 'licenses: [...]' property on targets as needed.
+//
+// For unused files, consider creating a 'fileGroup' with "//visibility:private"
+// to attach the license to, and including a comment whether the files may be
+// used in the current project.
+// See: http://go/android-license-faq
+license {
+    name: "external_libwebsockets_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-Apache-2.0",
+        "SPDX-license-identifier-BSD",
+        "SPDX-license-identifier-Beerware",
+        "SPDX-license-identifier-CC0-1.0",
+        "SPDX-license-identifier-GPL",
+        "SPDX-license-identifier-LGPL",
+        "SPDX-license-identifier-MIT",
+        "SPDX-license-identifier-Zlib",
+        "legacy_permissive",
+        "legacy_unencumbered",
+    ],
+    license_text: [
+        "LICENSE",
+    ],
+}
+
 libwebsocketsSrcFiles = [
     "lib/core-net/adopt.c",
     "lib/core-net/client.c",
diff --git a/contrib/Android.mk b/contrib/Android.mk
index 20b2e10a..5d25757b 100644
--- a/contrib/Android.mk
+++ b/contrib/Android.mk
@@ -6,6 +6,9 @@ LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE    := libwebsockets
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD SPDX-license-identifier-GPL SPDX-license-identifier-MIT SPDX-license-identifier-Zlib legacy_unencumbered
+LOCAL_LICENSE_CONDITIONS := notice restricted unencumbered
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../LICENSE
 LOCAL_CFLAGS    := -DLWS_BUILTIN_GETIFADDRS
 LWS_LIB_PATH	:= ../../../shared/libwebsockets/lib
 LOCAL_C_INCLUDES:= $(LOCAL_PATH)/$(LWS_LIB_PATH)
diff --git a/test-apps/android/app/src/main/jni/Android.mk b/test-apps/android/app/src/main/jni/Android.mk
index 80720ceb..0b26a98a 100644
--- a/test-apps/android/app/src/main/jni/Android.mk
+++ b/test-apps/android/app/src/main/jni/Android.mk
@@ -5,6 +5,9 @@ LOCAL_PATH := $(call my-dir)
 #
 include $(CLEAR_VARS)
 LOCAL_MODULE := libz
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-CC0-1.0 legacy_unencumbered
+LOCAL_LICENSE_CONDITIONS := unencumbered
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../../../../LICENSE
 LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/lib/libz.a
 include $(PREBUILT_STATIC_LIBRARY)
 
@@ -12,6 +15,9 @@ include $(PREBUILT_STATIC_LIBRARY)
 #
 include $(CLEAR_VARS)
 LOCAL_MODULE := libssl
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-CC0-1.0 legacy_unencumbered
+LOCAL_LICENSE_CONDITIONS := unencumbered
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../../../../LICENSE
 LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/lib/libssl.a
 include $(PREBUILT_STATIC_LIBRARY)
 
@@ -19,6 +25,9 @@ include $(PREBUILT_STATIC_LIBRARY)
 #
 include $(CLEAR_VARS)
 LOCAL_MODULE := libcrypto
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-CC0-1.0 legacy_unencumbered
+LOCAL_LICENSE_CONDITIONS := unencumbered
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../../../../LICENSE
 LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/lib/libcrypto.a
 include $(PREBUILT_STATIC_LIBRARY)
 
@@ -26,6 +35,9 @@ include $(PREBUILT_STATIC_LIBRARY)
 #
 include $(CLEAR_VARS)
 LOCAL_MODULE := libwebsockets
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-CC0-1.0 legacy_unencumbered
+LOCAL_LICENSE_CONDITIONS := unencumbered
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../../../../LICENSE
 LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/lib/libwebsockets.a
 include $(PREBUILT_STATIC_LIBRARY)
 
@@ -34,6 +46,9 @@ include $(PREBUILT_STATIC_LIBRARY)
 include $(CLEAR_VARS)
 LOCAL_DISABLE_FATAL_LINKER_WARNINGS := true
 LOCAL_MODULE := lwsservice
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-CC0-1.0 legacy_unencumbered
+LOCAL_LICENSE_CONDITIONS := unencumbered
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../../../../LICENSE
 LOCAL_SRC_FILES := LwsService.cpp
 LOCAL_C_INCLUDES := $(LOCAL_PATH) $(TARGET_ARCH_ABI)/include
 LOCAL_STATIC_LIBRARIES := websockets z ssl crypto