aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Badour <bbadour@google.com>2021-02-16 22:23:31 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-02-16 22:23:31 +0000
commit45898755eee63d41077c79eefe3aab466ce08030 (patch)
tree5108c5d632b12db46200c44e542631ad98c384a1
parentac07420bf39541a02fe6766609ea280754975d8a (diff)
parent72d20bb208d56a96c1e311ee873b33d70cdb462c (diff)
downloadvogar-45898755eee63d41077c79eefe3aab466ce08030.tar.gz
[LSC] Add LOCAL_LICENSE_KINDS to external/vogar am: 8cac410401 am: 72d20bb208
Original change: https://android-review.googlesource.com/c/platform/external/vogar/+/1588899 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2e13e342595e3fbcddd92e3b117864921d756b6e
-rw-r--r--Android.bp30
-rw-r--r--Android.mk10
2 files changed, 39 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index 83464fa..4d94783 100644
--- a/Android.bp
+++ b/Android.bp
@@ -15,6 +15,36 @@
// Build dependencies.
// ============================================================
+package {
+ default_applicable_licenses: ["external_vogar_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_vogar_license",
+ visibility: [":__subpackages__"],
+ license_kinds: [
+ "SPDX-license-identifier-Apache-2.0",
+ "SPDX-license-identifier-BSD",
+ ],
+ license_text: [
+ "LICENSE",
+ ],
+}
+
java_import_host {
name: "vogar-jsr305",
jars: ["lib/jsr305.jar"],
diff --git a/Android.mk b/Android.mk
index b0dbc16..1472829 100644
--- a/Android.mk
+++ b/Android.mk
@@ -20,6 +20,9 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := vogar
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/LICENSE
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
LOCAL_SRC_FILES := $(call all-java-files-under, src/)
@@ -55,6 +58,9 @@ run-vogar-tests: vogar-tests
include $(CLEAR_VARS)
LOCAL_MODULE := vogar-tests
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/LICENSE
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := JAVA_LIBRARIES
LOCAL_SRC_FILES := $(call all-java-files-under, test/)
@@ -73,6 +79,8 @@ include $(CLEAR_VARS)
LOCAL_IS_HOST_MODULE := true
LOCAL_MODULE_CLASS := EXECUTABLES
LOCAL_MODULE := vogar
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD
+LOCAL_LICENSE_CONDITIONS := notice
+LOCAL_NOTICE_FILE := $(LOCAL_PATH)/LICENSE
LOCAL_SRC_FILES := bin/vogar-android
include $(BUILD_PREBUILT)
-