aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Badour <bbadour@google.com>2021-02-17 18:07:48 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-02-17 18:07:48 +0000
commit3df3306e3889ae871f5c6e8a039f0ea04eee5991 (patch)
tree15eeeb43c7bbd77d23f5e9f0af837722a7737e34
parentc18155af3103cc2b158bca848200b4a08ef7c9aa (diff)
parent18fed8206a6bdd308e53da98dee210a9ecf32644 (diff)
downloadlibusb-3df3306e3889ae871f5c6e8a039f0ea04eee5991.tar.gz
Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/libusb" am: f4e56d84e0 am: be2f3e44e2 am: 8f17adeb23 am: 18fed8206a
Original change: https://android-review.googlesource.com/c/platform/external/libusb/+/1588629 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7e860f6ee7d8a227bc4a9317b9ec32d4396b6917
-rw-r--r--Android.bp40
-rw-r--r--android/jni/examples.mk21
-rw-r--r--android/jni/libusb.mk3
-rw-r--r--android/jni/tests.mk3
4 files changed, 66 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index f293257..de529f2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,3 +1,42 @@
+package {
+ default_applicable_licenses: ["external_libusb_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.
+//
+// large-scale-change included anything that looked like it might be a license
+// text as a license_text. e.g. LICENSE, NOTICE, COPYING etc.
+//
+// Please consider removing redundant or irrelevant files from 'license_text:'.
+// See: http://go/android-license-faq
+license {
+ name: "external_libusb_license",
+ visibility: [":__subpackages__"],
+ license_kinds: [
+ "SPDX-license-identifier-GPL",
+ "SPDX-license-identifier-LGPL",
+ "SPDX-license-identifier-LGPL-2.1",
+ "SPDX-license-identifier-LGPL-3.0",
+ "SPDX-license-identifier-MIT",
+ ],
+ license_text: [
+ "COPYING",
+ "NOTICE",
+ ],
+}
+
cc_library {
name: "libusb",
host_supported: true,
@@ -108,4 +147,3 @@ cc_library {
shared_libs: ["liblog"],
export_include_dirs: ["include"],
}
-
diff --git a/android/jni/examples.mk b/android/jni/examples.mk
index 30b5c84..d0ffb82 100644
--- a/android/jni/examples.mk
+++ b/android/jni/examples.mk
@@ -34,6 +34,9 @@ LOCAL_C_INCLUDES += \
LOCAL_SHARED_LIBRARIES += libusb1.0
LOCAL_MODULE := dpfp
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-LGPL SPDX-license-identifier-LGPL-2.1 SPDX-license-identifier-LGPL-3.0
+LOCAL_LICENSE_CONDITIONS := restricted
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../COPYING $(LOCAL_PATH)/../../NOTICE
include $(BUILD_EXECUTABLE)
@@ -53,6 +56,9 @@ LOCAL_CFLAGS := -DDPFP_THREADED -pthread
LOCAL_SHARED_LIBRARIES += libusb1.0
LOCAL_MODULE := dpfp_threaded
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-LGPL SPDX-license-identifier-LGPL-2.1 SPDX-license-identifier-LGPL-3.0
+LOCAL_LICENSE_CONDITIONS := restricted
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../COPYING $(LOCAL_PATH)/../../NOTICE
include $(BUILD_EXECUTABLE)
@@ -71,6 +77,9 @@ LOCAL_C_INCLUDES += \
LOCAL_SHARED_LIBRARIES += libusb1.0
LOCAL_MODULE := fxload
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-LGPL SPDX-license-identifier-LGPL-2.1 SPDX-license-identifier-LGPL-3.0
+LOCAL_LICENSE_CONDITIONS := restricted
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../COPYING $(LOCAL_PATH)/../../NOTICE
include $(BUILD_EXECUTABLE)
@@ -88,6 +97,9 @@ LOCAL_C_INCLUDES += \
LOCAL_SHARED_LIBRARIES += libusb1.0
LOCAL_MODULE := hotplugtest
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-LGPL SPDX-license-identifier-LGPL-2.1 SPDX-license-identifier-LGPL-3.0
+LOCAL_LICENSE_CONDITIONS := restricted
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../COPYING $(LOCAL_PATH)/../../NOTICE
include $(BUILD_EXECUTABLE)
@@ -105,6 +117,9 @@ LOCAL_C_INCLUDES += \
LOCAL_SHARED_LIBRARIES += libusb1.0
LOCAL_MODULE := listdevs
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-LGPL SPDX-license-identifier-LGPL-2.1 SPDX-license-identifier-LGPL-3.0
+LOCAL_LICENSE_CONDITIONS := restricted
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../COPYING $(LOCAL_PATH)/../../NOTICE
include $(BUILD_EXECUTABLE)
@@ -122,6 +137,9 @@ LOCAL_C_INCLUDES += \
LOCAL_SHARED_LIBRARIES += libusb1.0
LOCAL_MODULE := sam3u_benchmark
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-LGPL SPDX-license-identifier-LGPL-2.1 SPDX-license-identifier-LGPL-3.0
+LOCAL_LICENSE_CONDITIONS := restricted
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../COPYING $(LOCAL_PATH)/../../NOTICE
include $(BUILD_EXECUTABLE)
@@ -139,5 +157,8 @@ LOCAL_C_INCLUDES += \
LOCAL_SHARED_LIBRARIES += libusb1.0
LOCAL_MODULE := xusb
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-LGPL SPDX-license-identifier-LGPL-2.1 SPDX-license-identifier-LGPL-3.0
+LOCAL_LICENSE_CONDITIONS := restricted
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../COPYING $(LOCAL_PATH)/../../NOTICE
include $(BUILD_EXECUTABLE)
diff --git a/android/jni/libusb.mk b/android/jni/libusb.mk
index dacf1ee..c7ac77c 100644
--- a/android/jni/libusb.mk
+++ b/android/jni/libusb.mk
@@ -49,5 +49,8 @@ LOCAL_CFLAGS := -fvisibility=hidden -pthread
LOCAL_LDLIBS := -llog
LOCAL_MODULE := libusb1.0
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-LGPL SPDX-license-identifier-LGPL-2.1 SPDX-license-identifier-LGPL-3.0
+LOCAL_LICENSE_CONDITIONS := restricted
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../COPYING $(LOCAL_PATH)/../../NOTICE
include $(BUILD_SHARED_LIBRARY)
diff --git a/android/jni/tests.mk b/android/jni/tests.mk
index b42bd1c..56315c5 100644
--- a/android/jni/tests.mk
+++ b/android/jni/tests.mk
@@ -35,5 +35,8 @@ LOCAL_C_INCLUDES += \
LOCAL_SHARED_LIBRARIES += libusb1.0
LOCAL_MODULE := stress
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-LGPL SPDX-license-identifier-LGPL-2.1 SPDX-license-identifier-LGPL-3.0
+LOCAL_LICENSE_CONDITIONS := restricted
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../COPYING $(LOCAL_PATH)/../../NOTICE
include $(BUILD_EXECUTABLE)