commit 15e4988d25b2cd0df419033cf5065756aa162bdc
author Haibo Huang <hhb@google.com> Mon Apr 13 19:17:38 2020 -0700
committer Haibo Huang <hhb@google.com> Wed Apr 15 23:37:32 2020 +0000
tree 739ab170b31f1ba28db22c325a1bdcf4c26569bc
parent d581c0ae70655e4c18ff00182867c81600f408a8
parent c2e53733a895587c2910d2b2a1312d4224e5a474

Upgrade cn-cbor to c2e53733a895587c2910d2b2a1312d4224e5a474

Exempt-From-Owner-Approval: upgrade
Change-Id: I65846d53d2a99b7c75129a13c21cc1d00ebc0fa5

Android.bp

diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..08a727b
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,32 @@
+
+cc_library {
+  name: "libcn-cbor",
+  vendor_available: true,
+  vndk: {
+      enabled: true,
+  },
+  srcs: [
+    "src/cn-cbor.c",
+    "src/cn-create.c",
+    "src/cn-encoder.c",
+    "src/cn-error.c",
+    "src/cn-get.c",
+  ],
+  local_include_dirs: [
+    "include",
+  ],
+  export_include_dirs: [
+    "include",
+  ],
+  unique_host_soname: true,
+  host_supported: true,
+}
+
+cc_test {
+  name: "cn-cbor_test",
+  host_supported: true,
+  srcs: [
+    "test/cbor_test.c",
+  ],
+  shared_libs: [ "libcn-cbor", ],
+}

METADATA

diff --git a/METADATA b/METADATA
new file mode 100644
index 0000000..adbeb30
--- /dev/null
+++ b/METADATA
@@ -0,0 +1,19 @@
+name: "cn-cbor"
+description: "cn-cbor: A constrained node implementation of CBOR in C"
+third_party {
+  url {
+    type: HOMEPAGE
+    value: "https://github.com/cabo/cn-cbor"
+  }
+  url {
+    type: GIT
+    value: "https://github.com/cabo/cn-cbor.git"
+  }
+  version: "c2e53733a895587c2910d2b2a1312d4224e5a474"
+  license_type: NOTICE
+  last_upgrade_date {
+    year: 2020
+    month: 4
+    day: 13
+  }
+}

MODULE_LICENSE_MIT

diff --git a/MODULE_LICENSE_MIT b/MODULE_LICENSE_MIT
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/MODULE_LICENSE_MIT

OWNERS

diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000..a83afb5
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,3 @@
+# Default code reviewers picked from top 3 or more developers.
+# Please update this list if you find better candidates.
+jdanis@google.com

src/cn-cbor.c

diff --git a/src/cn-cbor.c b/src/cn-cbor.c
index 9093537..2526b92 100644
--- a/src/cn-cbor.c
+++ b/src/cn-cbor.c
@@ -53,7 +53,7 @@
 
 #ifndef CBOR_ALIGN_READS
 #define ntoh16p(p) (ntohs(*(unsigned short*)(p)))
-#define ntoh32p(p) (ntohl(*(unsigned long*)(p)))
+#define ntoh32p(p) (ntohl(*(uint32_t*)(p)))
 #else
 static uint16_t ntoh16p(unsigned char *p) {
     uint16_t tmp;