Snap for 7547121 from ef53808ed93fbe66d5fb0a05f7f2c99883f2c947 to mainline-permission-releaseandroid-mainline-12.0.0_r93android-mainline-12.0.0_r79android-mainline-12.0.0_r64android-mainline-12.0.0_r51android-mainline-12.0.0_r34android-mainline-12.0.0_r15android-mainline-12.0.0_r123android-mainline-12.0.0_r107android12-mainline-permission-release

Change-Id: I2c1dba2ada1f1a740f0a5fb6f743315a0a5e28a6

2 files changed, 32 insertions, 0 deletions

diff --git a/Android.bp b/Android.bp
index 23ab6be..837c0fe 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,34 @@
 // We only build the static library at the moment.
+package {
+    default_applicable_licenses: ["external_libutf_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_libutf_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-LPL-1.02",
+        "SPDX-license-identifier-MIT",
+    ],
+    license_text: [
+        "NOTICE",
+    ],
+}
+
 cc_library_static {
     name: "libutf",
     srcs: [
@@ -40,6 +70,7 @@ cc_library_static {
 
     apex_available: [
         "//apex_available:platform",
+        "com.android.appsearch",
         "com.android.extservices",
     ],
 }
diff --git a/METADATA b/METADATA
index 6abebed..d92b67a 100644
--- a/METADATA
+++ b/METADATA
@@ -11,5 +11,6 @@ third_party {
     value: "http://google3/third_party/libutf"
   }
   version: "1.1"
+  license_type: NOTICE
   last_upgrade_date { year: 2018 month: 9 day: 19 }
 }