From 7c8d3e287e14e4f437888c330ae4bf9cffd31a8d Mon Sep 17 00:00:00 2001
From: Rahul Frias <rfrias@google.com>
Date: Wed, 7 Apr 2021 15:38:05 -0700
Subject: [PATCH] Correction to addition of LOCAL_LICENSE_KINDS to
 vendor/widevine

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

Bug: 68860345
Bug: 151177513
Bug: 151953481
Test: mm
Change-Id: I676a63598c8a7df11a1cef6d8bebcc9940c961dc
---
 libwvdrmengine/cdm/core/src/Android.bp  | 30 ++++++------------------
 libwvdrmengine/cdm/core/test/Android.bp | 31 ++++++-------------------
 2 files changed, 14 insertions(+), 47 deletions(-)

diff --git a/libwvdrmengine/cdm/core/src/Android.bp b/libwvdrmengine/cdm/core/src/Android.bp
index d6631060..5b6afc36 100644
--- a/libwvdrmengine/cdm/core/src/Android.bp
+++ b/libwvdrmengine/cdm/core/src/Android.bp
@@ -2,29 +2,13 @@
 //     CONSULT THE OWNERS AND opensource-licensing@google.com BEFORE
 //     DEPENDING ON IT IN YOUR PROJECT. ***
 package {
-    default_applicable_licenses: [
-        "vendor_widevine_libwvdrmengine_cdm_core_src_license",
-    ],
-}
-
-// Added automatically by a large-scale-change
-//
-// 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",
-    ],
+    // See: http://go/android-license-faq
+    // 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
+    //   legacy_by_exception_only (by exception only)
+    default_applicable_licenses: ["vendor_widevine_license"],
 }
 
 cc_library {
diff --git a/libwvdrmengine/cdm/core/test/Android.bp b/libwvdrmengine/cdm/core/test/Android.bp
index 6c868c08..c170be40 100644
--- a/libwvdrmengine/cdm/core/test/Android.bp
+++ b/libwvdrmengine/cdm/core/test/Android.bp
@@ -16,30 +16,13 @@
 //     CONSULT THE OWNERS AND opensource-licensing@google.com BEFORE
 //     DEPENDING ON IT IN YOUR PROJECT. ***
 package {
-    default_applicable_licenses: [
-        "vendor_widevine_libwvdrmengine_cdm_core_test_license",
-    ],
-}
-
-// Added automatically by a large-scale-change
-//
-// 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",
-    ],
+    // See: http://go/android-license-faq
+    // 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
+    //   legacy_by_exception_only (by exception only)
+    default_applicable_licenses: ["vendor_widevine_license"],
 }
 
 filegroup {