From 4bc189377da5f3cb27fb439d677cb89f3390a7a6 Mon Sep 17 00:00:00 2001
From: Bob Badour <bbadour@google.com>
Date: Wed, 23 Jun 2021 15:57:01 -0700
Subject: Fix license text -- switch to Android-Apache-2.0

Remove Apache 2.0 from license that also included a Public Domain
license to pick up the global license text. Make explicit that the
remaining Public Domain license requires no license_text.

Test: m nothing

Bug: 151177513

Change-Id: Ic9da28b65630b83c3bf4f3441fc54d9364b845e9
Merged-in: Ic9da28b65630b83c3bf4f3441fc54d9364b845e9
---
 Android.bp | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/Android.bp b/Android.bp
index de0247921..fde741ac3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -13,31 +13,18 @@
 // limitations under the License.
 
 package {
-    default_applicable_licenses: ["packages_apps_DocumentsUI_license"],
+    default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
-// 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: "packages_apps_DocumentsUI_license",
-    visibility: [":__subpackages__"],
+    // res/drawable contains at least 1 Public Domain file
+    name: "packages_apps_DocumentsUI_res_drawable_pd_license",
+    visibility: ["//visibility:private"],
     license_kinds: [
-        "SPDX-license-identifier-Apache-2.0",
         "legacy_unencumbered",
     ],
-    // large-scale-change unable to identify any license_text files
+    license_text: [],
 }
 
 java_defaults {
@@ -140,6 +127,11 @@ android_library {
         "res",
     ],
 
+    licenses: [
+        "Android-Apache-2.0",
+        "packages_apps_DocumentsUI_res_drawable_pd_license",
+    ],
+
     aaptflags: [
         "--auto-add-overlay",
     ],
@@ -163,6 +155,11 @@ android_app {
         "res",
     ],
 
+    licenses: [
+        "Android-Apache-2.0",
+        "packages_apps_DocumentsUI_res_drawable_pd_license",
+    ],
+
     required: ["privapp_whitelist_com.android.documentsui"],
 
     min_sdk_version: "29",
-- 
cgit v1.2.3