diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-01-20 05:56:32 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-01-20 05:56:32 +0000 |
commit | acc775cc2e439595af930e12ffb8ef9e793cac46 (patch) | |
tree | 9d9eccaed5224b1b42883a9cbf00c94ce9331810 | |
parent | 621469a1c6b4d3871a7773bd8247761b1ae20ba7 (diff) | |
parent | abed605544e42331335fa4bdf01185f4da99ea1c (diff) | |
download | wilhelm-acc775cc2e439595af930e12ffb8ef9e793cac46.tar.gz |
Merge "Fix licenses and license text."android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1
-rw-r--r-- | Android.bp | 28 | ||||
-rw-r--r-- | src/Android.bp | 10 | ||||
-rw-r--r-- | tests/Android.bp | 10 | ||||
-rw-r--r-- | tests/examples/Android.bp | 10 | ||||
-rw-r--r-- | tests/mimeUri/Android.bp | 10 |
5 files changed, 25 insertions, 43 deletions
@@ -13,31 +13,21 @@ // limitations under the License. package { - default_applicable_licenses: ["frameworks_wilhelm_license"], + // See: http://go/android-license-faq + default_applicable_licenses: [ + "Android-Apache-2.0", + "frameworks_wilhelm_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: "frameworks_wilhelm_license", visibility: [":__subpackages__"], - license_kinds: [ - "SPDX-license-identifier-Apache-2.0", - "SPDX-license-identifier-MIT", + license_kinds: ["SPDX-license-identifier-MIT"], + license_text: [ + "include/OMXAL/NOTICE", + "include/SLES/NOTICE", ], - // large-scale-change unable to identify any license_text files } ndk_headers { diff --git a/src/Android.bp b/src/Android.bp index 827b4a4..ce3089d 100644 --- a/src/Android.bp +++ b/src/Android.bp @@ -1,11 +1,9 @@ package { // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "frameworks_wilhelm_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - // SPDX-license-identifier-MIT - default_applicable_licenses: ["frameworks_wilhelm_license"], + default_applicable_licenses: [ + "Android-Apache-2.0", + "frameworks_wilhelm_license", // MIT + ], } cc_library_static { diff --git a/tests/Android.bp b/tests/Android.bp index 9241d9e..a219706 100644 --- a/tests/Android.bp +++ b/tests/Android.bp @@ -1,12 +1,10 @@ // Build the unit tests. package { // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "frameworks_wilhelm_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - // SPDX-license-identifier-MIT - default_applicable_licenses: ["frameworks_wilhelm_license"], + default_applicable_licenses: [ + "Android-Apache-2.0", + "frameworks_wilhelm_license", // MIT + ], } cc_test { diff --git a/tests/examples/Android.bp b/tests/examples/Android.bp index 9603c26..8a0d0e4 100644 --- a/tests/examples/Android.bp +++ b/tests/examples/Android.bp @@ -2,12 +2,10 @@ package { // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "frameworks_wilhelm_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - // SPDX-license-identifier-MIT - default_applicable_licenses: ["frameworks_wilhelm_license"], + default_applicable_licenses: [ + "Android-Apache-2.0", + "frameworks_wilhelm_license", // MIT + ], } cc_test { diff --git a/tests/mimeUri/Android.bp b/tests/mimeUri/Android.bp index 5e6fafd..994914d 100644 --- a/tests/mimeUri/Android.bp +++ b/tests/mimeUri/Android.bp @@ -2,12 +2,10 @@ package { // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "frameworks_wilhelm_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - // SPDX-license-identifier-MIT - default_applicable_licenses: ["frameworks_wilhelm_license"], + default_applicable_licenses: [ + "Android-Apache-2.0", + "frameworks_wilhelm_license", // MIT + ], } cc_test { |