diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2021-02-17 03:17:20 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-02-17 03:17:20 +0000 |
commit | 65330a4f57c7856d9ced7be4b478a6b0661e84b0 (patch) | |
tree | d6fc62600342d3117da115c58ad22ef995529ea7 | |
parent | 4b04b17f67dd644bb654a399831f01bef8f6990f (diff) | |
parent | 05b5ded674ffb5a9b9c4dcf0169d1810e4c7bcf2 (diff) | |
download | skqp-65330a4f57c7856d9ced7be4b478a6b0661e84b0.tar.gz |
Snap for 7149879 from 05b5ded674ffb5a9b9c4dcf0169d1810e4c7bcf2 to sc-v2-release
Change-Id: I2afe99e69ac52e3fbcb7734b5f41947144aaa037
-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 454784f484..1281453012 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"], |