diff options
| author | Yu Shan <shanyu@google.com> | 2019-01-25 17:22:05 -0800 |
|---|---|---|
| committer | Yu Shan <shanyu@google.com> | 2019-02-19 11:55:23 -0800 |
| commit | c92d299de9abf79369f8aa12e83d2f510041ab2d (patch) | |
| tree | b8d143b880e61962fa6c074a68b67c071e4c75c8 | |
| parent | 68586e0b01e17779a09a98aa9a39e9c693fd6a3b (diff) | |
| download | platform_hardware_ril-c92d299de9abf79369f8aa12e83d2f510041ab2d.tar.gz platform_hardware_ril-c92d299de9abf79369f8aa12e83d2f510041ab2d.tar.bz2 platform_hardware_ril-c92d299de9abf79369f8aa12e83d2f510041ab2d.zip | |
Use 32BIT nanopb library.
Test: None
Bug: 122292884
Change-Id: Idb0d56749e41aa97a760dfed5246330041c3da3a
| -rw-r--r-- | libril/Android.mk | 3 | ||||
| -rw-r--r-- | librilutils/Android.bp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/libril/Android.mk b/libril/Android.mk index ee0530f3..a7735d20 100644 --- 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 91ef34e7..c5207f89 100644 --- 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, }, |