commit f0581c36240af1e25a4f7c36dd4c5fd7da6bf85b
author android-build-team Robot <android-build-team-robot@google.com> Thu Feb 21 04:07:45 2019 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Thu Feb 21 04:07:45 2019 +0000
tree af8f6a07ae5d5f42243e5a9821fd88d12906e936
parent 2c7fad088c72e70e7954b224399005a17328101a
parent 872074ccde1d0da259e276d38eb052d2cd051408

Snap for 5325928 from 872074ccde1d0da259e276d38eb052d2cd051408 to qt-release

Change-Id: I8a9ad8350afe5f296c4d36c9856a467f56a42231

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"],
+}