widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correction to addition of LOCAL_LICENSE_KINDS to vendor/widevine

Browse Source 
Remove incorrectly identified license files in http://go/ag/13998816

Bug: 68860345
Bug: 151177513
Bug: 151953481
Test: mm
Change-Id: I676a63598c8a7df11a1cef6d8bebcc9940c961dc
This commit is contained in:
Rahul Frias
2021-04-07 15:38:05 -07:00
parent c287730627
commit 7c8d3e287e
2 changed files with 14 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
libwvdrmengine/cdm/core/src/Android.bp
View File

@@ -2,29 +2,13 @@
// CONSULT THE OWNERS AND opensource-licensing@google.com BEFORE // CONSULT THE OWNERS AND opensource-licensing@google.com BEFORE
// DEPENDING ON IT IN YOUR PROJECT. *** // DEPENDING ON IT IN YOUR PROJECT. ***
package { package {
default_applicable_licenses: [ // See: http://go/android-license-faq
"vendor_widevine_libwvdrmengine_cdm_core_src_license", // A large-scale-change added 'default_applicable_licenses' to import
], // all of the 'license_kinds' from "vendor_widevine_license"
} // to get the below license kinds:
// SPDX-license-identifier-Apache-2.0
// Added automatically by a large-scale-change // legacy_by_exception_only (by exception only)
// default_applicable_licenses: ["vendor_widevine_license"],
// large-scale-change included anything that looked like it might be a license
// text as a license_text. e.g. LICENSE, NOTICE, COPYING etc.
//
// Please consider removing redundant or irrelevant files from 'license_text:'.
// See: http://go/android-license-faq
license {
name: "vendor_widevine_libwvdrmengine_cdm_core_src_license",
visibility: [":__subpackages__"],
license_kinds: [
"legacy_by_exception_only", // by exception only
],
license_text: [
"license.cpp",
"license_key_status.cpp",
"license_protocol.proto",
],
} }
cc_library { cc_library {

31
libwvdrmengine/cdm/core/test/Android.bp
View File

@@ -16,30 +16,13 @@
// CONSULT THE OWNERS AND opensource-licensing@google.com BEFORE // CONSULT THE OWNERS AND opensource-licensing@google.com BEFORE
// DEPENDING ON IT IN YOUR PROJECT. *** // DEPENDING ON IT IN YOUR PROJECT. ***
package { package {
default_applicable_licenses: [ // See: http://go/android-license-faq
"vendor_widevine_libwvdrmengine_cdm_core_test_license", // A large-scale-change added 'default_applicable_licenses' to import
], // all of the 'license_kinds' from "vendor_widevine_license"
} // to get the below license kinds:
// SPDX-license-identifier-Apache-2.0
// Added automatically by a large-scale-change // legacy_by_exception_only (by exception only)
// default_applicable_licenses: ["vendor_widevine_license"],
// large-scale-change included anything that looked like it might be a license
// text as a license_text. e.g. LICENSE, NOTICE, COPYING etc.
//
// Please consider removing redundant or irrelevant files from 'license_text:'.
// See: http://go/android-license-faq
license {
name: "vendor_widevine_libwvdrmengine_cdm_core_test_license",
visibility: [":__subpackages__"],
license_kinds: [
"legacy_by_exception_only", // by exception only
],
license_text: [
"license_keys_unittest.cpp",
"license_request.cpp",
"license_request.h",
"license_unittest.cpp",
],
} }
filegroup { filegroup {