commit 872074ccde1d0da259e276d38eb052d2cd051408
author Yu Shan <shanyu@google.com> Wed Feb 20 12:51:20 2019 -0800
committer android-build-merger <android-build-merger@google.com> Wed Feb 20 12:51:20 2019 -0800
tree af8f6a07ae5d5f42243e5a9821fd88d12906e936
parent f0cc6922c45f2d7aee6002922d6b5f203114a92a
parent 1d0ca598528cafa8718456792cfde429d08b77ea

Add 32BIT and 16BIT nanopb library. am: 3f5b6d4262 am: aaae7fff6e
am: 1d0ca59852

Change-Id: I412488a20b4fcfa05f58528c2e38fff5a7e3a0c0

Android.bp

diff --git a/Android.bp b/Android.bp
index d9378f9..c9c5958 100644
--- a/Android.bp
+++ b/Android.bp
@@ -29,19 +29,45 @@
     ],
     sdk_version: "19",
     export_include_dirs: ["."],
+    vendor_available: true,
 }
 
 cc_library_static {
     name: "libprotobuf-c-nano",
-    vendor_available: true,
     defaults: ["libprotobuf-c-nano-defaults"],
 }
 
 cc_library_static {
     name: "libprotobuf-c-nano-enable_malloc",
-    vendor_available: true,
     defaults: ["libprotobuf-c-nano-defaults"],
 
     cflags: ["-DPB_ENABLE_MALLOC"],
 }
 
+cc_library_static {
+    name: "libprotobuf-c-nano-16bit",
+    defaults: ["libprotobuf-c-nano-defaults"],
+
+    cflags: ["-DPB_FIELD_16BIT"],
+}
+
+cc_library_static {
+    name: "libprotobuf-c-nano-enable_malloc-16bit",
+    defaults: ["libprotobuf-c-nano-defaults"],
+
+    cflags: ["-DPB_ENABLE_MALLOC", "-DPB_FIELD_16BIT"],
+}
+
+cc_library_static {
+    name: "libprotobuf-c-nano-32bit",
+    defaults: ["libprotobuf-c-nano-defaults"],
+
+    cflags: ["-DPB_FIELD_32BIT"],
+}
+
+cc_library_static {
+    name: "libprotobuf-c-nano-enable_malloc-32bit",
+    defaults: ["libprotobuf-c-nano-defaults"],
+
+    cflags: ["-DPB_ENABLE_MALLOC", "-DPB_FIELD_32BIT"],
+}