diff options
author | Bob Badour <bbadour@google.com> | 2021-02-16 18:18:31 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-16 18:18:31 +0000 |
commit | 5e438b355e6d7d57d0e41bacfa5892fca1658584 (patch) | |
tree | 7d57f351be62806c3ba6b56832555a84f5822ed1 | |
parent | 06dac175f1c1e23fe984cacb3f17e5c7a5e5e536 (diff) | |
parent | 45462d4b60ed48d0d150884b8de5ff44afa0ec56 (diff) | |
download | skqp-5e438b355e6d7d57d0e41bacfa5892fca1658584.tar.gz |
[LSC] Add LOCAL_LICENSE_KINDS to external/skqp am: 45462d4b60
Original change: https://android-review.googlesource.com/c/platform/external/skqp/+/1588977
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ifbd4e91af40e9cfc4d0e1d319b068a21950043f7
-rw-r--r-- | Android.bp | 40 | ||||
-rw-r--r-- | platform_tools/android/apps/skqp/src/main/Android.bp | 13 |
2 files changed, 53 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp index a880ebf4cd..a9d86ff66f 100644 --- a/Android.bp +++ b/Android.bp @@ -1,5 +1,45 @@ // This file is autogenerated by tools/skqp/gn_to_bp.py. +package { + default_applicable_licenses: ["external_skqp_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 filtered out the below license kinds as false-positives: +// SPDX-license-identifier-GPL-2.0 +// SPDX-license-identifier-LGPL-2.1 +// SPDX-license-identifier-OFL +// See: http://go/android-license-faq +license { + name: "external_skqp_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-Apache-2.0", + "SPDX-license-identifier-BSD", + "SPDX-license-identifier-CC0-1.0", + "SPDX-license-identifier-FTL", + "SPDX-license-identifier-MIT", + "SPDX-license-identifier-MPL", + "legacy_unencumbered", + ], + license_text: [ + "LICENSE", + ], +} + cc_library_shared { name: "libskqp_app", sdk_version: "26", diff --git a/platform_tools/android/apps/skqp/src/main/Android.bp b/platform_tools/android/apps/skqp/src/main/Android.bp index 7b31d49e44..58c15f367a 100644 --- a/platform_tools/android/apps/skqp/src/main/Android.bp +++ b/platform_tools/android/apps/skqp/src/main/Android.bp @@ -2,6 +2,19 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "external_skqp_license" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + // SPDX-license-identifier-BSD + // SPDX-license-identifier-CC0-1.0 + // SPDX-license-identifier-MIT + // legacy_unencumbered + default_applicable_licenses: ["external_skqp_license"], +} + android_test { name: "CtsSkQPTestCases", defaults: ["cts_defaults"], |