From b1d153c07965d61ea9fadb5fa8f813dcf60e4b56 Mon Sep 17 00:00:00 2001 From: Bob Badour <bbadour@google.com> Date: Fri, 12 Feb 2021 15:51:37 -0800 Subject: [PATCH] [LSC] Add LOCAL_LICENSE_KINDS to external/v4l2_codec2 Added SPDX-license-identifier-BSD to: accel/Android.bp common/Android.bp components/Android.bp plugin_store/Android.bp service/Android.bp store/Android.bp tests/c2_comp_intf/Android.bp Added SPDX-license-identifier-BSD legacy_unencumbered to: Android.bp tests/c2_e2e_test/jni/Android.mk Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I4ef032a3849d650e13761a868b45309275d408a2 --- Android.bp | 44 ++++++++++++++++++++++++++++++++ accel/Android.bp | 9 +++++++ common/Android.bp | 9 +++++++ components/Android.bp | 9 +++++++ plugin_store/Android.bp | 9 +++++++ service/Android.bp | 9 +++++++ store/Android.bp | 10 +++++++- tests/c2_comp_intf/Android.bp | 9 +++++++ tests/c2_e2e_test/jni/Android.mk | 3 +++ 9 files changed, 110 insertions(+), 1 deletion(-) create mode 100644 Android.bp diff --git a/Android.bp b/Android.bp new file mode 100644 index 0000000..7f53aec --- /dev/null +++ b/Android.bp @@ -0,0 +1,44 @@ +// +// Copyright (C) 2021 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package { + default_applicable_licenses: ["external_v4l2_codec2_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_v4l2_codec2_license", + visibility: [":__subpackages__"], + license_kinds: [ + "SPDX-license-identifier-BSD", + "legacy_unencumbered", + ], + license_text: [ + "NOTICE", + ], +} diff --git a/accel/Android.bp b/accel/Android.bp index 1bf4805..fffd41e 100644 --- a/accel/Android.bp +++ b/accel/Android.bp @@ -1,3 +1,12 @@ +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "external_v4l2_codec2_license" + // to get the below license kinds: + // SPDX-license-identifier-BSD + default_applicable_licenses: ["external_v4l2_codec2_license"], +} + cc_library { name: "libv4l2_codec2_accel", vendor: true, diff --git a/common/Android.bp b/common/Android.bp index 45334d0..c1ea4b1 100644 --- a/common/Android.bp +++ b/common/Android.bp @@ -1,3 +1,12 @@ +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "external_v4l2_codec2_license" + // to get the below license kinds: + // SPDX-license-identifier-BSD + default_applicable_licenses: ["external_v4l2_codec2_license"], +} + cc_library { name: "libv4l2_codec2_common", vendor: true, diff --git a/components/Android.bp b/components/Android.bp index 8273412..e1eb56d 100644 --- a/components/Android.bp +++ b/components/Android.bp @@ -1,3 +1,12 @@ +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "external_v4l2_codec2_license" + // to get the below license kinds: + // SPDX-license-identifier-BSD + default_applicable_licenses: ["external_v4l2_codec2_license"], +} + cc_library { name: "libv4l2_codec2_components", vendor: true, diff --git a/plugin_store/Android.bp b/plugin_store/Android.bp index 73dccaf..d2ea3a3 100644 --- a/plugin_store/Android.bp +++ b/plugin_store/Android.bp @@ -1,3 +1,12 @@ +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "external_v4l2_codec2_license" + // to get the below license kinds: + // SPDX-license-identifier-BSD + default_applicable_licenses: ["external_v4l2_codec2_license"], +} + cc_library_shared { name: "libc2plugin_store", vendor: true, diff --git a/service/Android.bp b/service/Android.bp index 5fee657..3bd1bab 100644 --- a/service/Android.bp +++ b/service/Android.bp @@ -1,3 +1,12 @@ +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "external_v4l2_codec2_license" + // to get the below license kinds: + // SPDX-license-identifier-BSD + default_applicable_licenses: ["external_v4l2_codec2_license"], +} + cc_binary { name: "android.hardware.media.c2@1.0-service-v4l2", diff --git a/store/Android.bp b/store/Android.bp index c2a6169..c36a912 100644 --- a/store/Android.bp +++ b/store/Android.bp @@ -1,3 +1,12 @@ +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "external_v4l2_codec2_license" + // to get the below license kinds: + // SPDX-license-identifier-BSD + default_applicable_licenses: ["external_v4l2_codec2_license"], +} + cc_library_shared { name: "libv4l2_codec2_store", vendor: true, @@ -27,4 +36,3 @@ cc_library_shared { "-Wthread-safety", // Check thread annotation at build time. ], } - diff --git a/tests/c2_comp_intf/Android.bp b/tests/c2_comp_intf/Android.bp index bc7ae83..f402af2 100644 --- a/tests/c2_comp_intf/Android.bp +++ b/tests/c2_comp_intf/Android.bp @@ -1,3 +1,12 @@ +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "external_v4l2_codec2_license" + // to get the below license kinds: + // SPDX-license-identifier-BSD + default_applicable_licenses: ["external_v4l2_codec2_license"], +} + cc_test { name: "C2VEACompIntf_test", vendor: true, diff --git a/tests/c2_e2e_test/jni/Android.mk b/tests/c2_e2e_test/jni/Android.mk index 78a863b..890a74b 100644 --- a/tests/c2_e2e_test/jni/Android.mk +++ b/tests/c2_e2e_test/jni/Android.mk @@ -31,6 +31,9 @@ LOCAL_NDK_STL_VARIANT := c++_static LOCAL_STATIC_LIBRARIES := libgtest_ndk_c++ LOCAL_MODULE := libcodectest +LOCAL_LICENSE_KINDS := SPDX-license-identifier-BSD legacy_unencumbered +LOCAL_LICENSE_CONDITIONS := notice unencumbered +LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../../../NOTICE # TODO(stevensd): Fix and reenable warnings LOCAL_CFLAGS += -Wno-everything -- GitLab