Snap for 7468467 from da2abc2b758ab59934b0814c299a44e6cf55e0e4 to mainline-mediaprovider-releaseandroid-mainline-12.0.0_r90android-mainline-12.0.0_r76android-mainline-12.0.0_r48android-mainline-12.0.0_r31android-mainline-12.0.0_r121android-mainline-12.0.0_r11android-mainline-12.0.0_r106aml_mpr_311911090android12-mainline-mediaprovider-release

Change-Id: Ic30074f593ac3db964eeac95e10e3daa6bea6aec

3 files changed, 54 insertions, 4 deletions

diff --git a/Android.bp b/Android.bp
index 08a727b..9ca75f9 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,34 @@
 
+package {
+    default_applicable_licenses: ["external_cn-cbor_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_cn-cbor_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-Apache-2.0",
+        "SPDX-license-identifier-MIT",
+    ],
+    license_text: [
+        "LICENSE",
+    ],
+}
+
 cc_library {
   name: "libcn-cbor",
   vendor_available: true,
@@ -29,4 +59,5 @@ cc_test {
     "test/cbor_test.c",
   ],
   shared_libs: [ "libcn-cbor", ],
+  gtest: false,
 }
diff --git a/METADATA b/METADATA
index 973907e..adbeb30 100644
--- a/METADATA
+++ b/METADATA
@@ -9,11 +9,11 @@ third_party {
     type: GIT
     value: "https://github.com/cabo/cn-cbor.git"
   }
-  version: "f1cf9ffdf5cfab935a45900556f9b68af925c256"
+  version: "c2e53733a895587c2910d2b2a1312d4224e5a474"
   license_type: NOTICE
   last_upgrade_date {
-    year: 2019
-    month: 2
-    day: 1
+    year: 2020
+    month: 4
+    day: 13
   }
 }
diff --git a/README.md b/README.md
index 5820858..4b57f09 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,25 @@
 
 # cn-cbor: A constrained node implementation of CBOR in C
 
+Below is the original README for cn-cbor, a Proof of Concept
+implementation of [CBOR](https://cbor.io) that I wrote in 2013.
+People have been sending me fixes and updates to make this
+implementation more useful for actual use, and for a while I have
+occasionally integrated them.  Jim Schaad now is so far ahead of this
+repo that you are most likely better off using [his
+repo](https://github.com/jimsch/cn-cbor) as your upstream.
+
+If you *are* here looking for experimental CBOR implementations for
+constrained nodes, there are many, some of which are listed at
+[cbor.io](https://cbor.io/impls.html).  One more: I have recently
+[extracted](https://github.com/cabo/bm_cbor) the implementation from
+ARM-mbed's [SUIT manifest
+generator](https://github.com/ARMmbed/suit-manifest-generator) (Apache
+2.0).  SUIT implementers report (CBOR-specific) code sizes in the low
+hundreds of bytes.  Thank you, [ARM](https://github.com/bremoran).
+
+# cn-cbor: A constrained node implementation of CBOR in C
+
 This is a constrained node implementation of [CBOR](http://cbor.io) in
 C that I threw together in 2013, before the publication of
 [RFC 7049](http://tools.ietf.org/html/rfc7049), to validate certain