Snap for 7478028 from a5c7678d592eb09d815736f5107b1ec5da8fb3b2 to mainline-documentsui-releaseandroid-mainline-12.0.0_r26android-mainline-12.0.0_r2aml_doc_310851020android12-mainline-documentsui-release

Change-Id: I834d2b7a556efbca41f554a89cefff1feafaebaf

3 files changed, 32 insertions, 2 deletions

diff --git a/Android.bp b/Android.bp
index 10a51ae..aaec394 100644
--- a/Android.bp
+++ b/Android.bp
@@ -14,6 +14,36 @@
 // limitations under the License.
 //
 
+package {
+    default_applicable_licenses: ["external_jsmn_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_jsmn_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-BSD",
+        "SPDX-license-identifier-MIT",
+    ],
+    license_text: [
+        "LICENSE",
+    ],
+}
+
 cc_library_static {
     name: "libjsmn",
     vendor_available: true,
diff --git a/METADATA b/METADATA
index bd2cb28..02461a1 100644
--- a/METADATA
+++ b/METADATA
@@ -9,7 +9,8 @@ third_party {
     type: ARCHIVE
     value: "https://github.com/zserge/jsmn/archive/fdcef3ebf886fa210d14956d3c068a653e76a24e.zip"
   }
-  version: "fdcef3ebf886fa210d14956d3c068a653e76a24e"
+  version: "v1.1.0"
+  license_type: NOTICE
   last_upgrade_date {
     year: 2019
     month: 5
diff --git a/NOTICE b/NOTICE
deleted file mode 120000
index 7a694c9..0000000
--- a/NOTICE
+++ /dev/null
@@ -1 +0,0 @@
-LICENSE
\ No newline at end of file