diff options
author | Bob Badour <bbadour@google.com> | 2021-02-16 22:23:31 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-16 22:23:31 +0000 |
commit | 45898755eee63d41077c79eefe3aab466ce08030 (patch) | |
tree | 5108c5d632b12db46200c44e542631ad98c384a1 | |
parent | ac07420bf39541a02fe6766609ea280754975d8a (diff) | |
parent | 72d20bb208d56a96c1e311ee873b33d70cdb462c (diff) | |
download | vogar-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.bp | 30 | ||||
-rw-r--r-- | Android.mk | 10 |
2 files changed, 39 insertions, 1 deletions
@@ -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"], @@ -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) - |