Use 32BIT nanopb library.

Test: None
Bug: 122292884
Change-Id: Idb0d56749e41aa97a760dfed5246330041c3da3a

diff --git a/libril/Android.mk b/libril/Android.mk
index ee0530f..a7735d2 100644 (file)
--- a/libril/Android.mk
+++ b/libril/Android.mk
@@ -26,9 +26,10 @@ LOCAL_SHARED_LIBRARIES := \
     libhwbinder
 
 LOCAL_STATIC_LIBRARIES := \
-    libprotobuf-c-nano-enable_malloc \
+    libprotobuf-c-nano-enable_malloc-32bit \
 
 LOCAL_CFLAGS += -Wall -Wextra -Wno-unused-parameter -Werror
+LOCAL_CFLAGS += -DPB_FIELD_32BIT
 
 ifeq ($(SIM_COUNT), 2)
     LOCAL_CFLAGS += -DANDROID_MULTI_SIM -DDSDA_RILD1

diff --git a/librilutils/Android.bp b/librilutils/Android.bp
index 91ef34e..c5207f8 100644 (file)
--- a/librilutils/Android.bp
+++ b/librilutils/Android.bp
@@ -16,10 +16,11 @@ cc_library {
         "-Wall",
         "-Wextra",
         "-Werror",
+        "-DPB_FIELD_32BIT"
     ],
 
     proto: {
-        type: "nanopb-c-enable_malloc",
+        type: "nanopb-c-enable_malloc-32bit",
         export_proto_headers: true,
     },