diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-03-06 10:51:12 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-03-06 10:51:12 +0000 |
| commit | 59f891bd3eac10d9995815bac6e453a7b27eb0d8 (patch) | |
| tree | 75b9798e4dc1f436a7a3bcdf8d5ef9d4561a4861 | |
| parent | 6b20f05f824492a81112fd03e6d0117e64a1b640 (diff) | |
| parent | c92d299de9abf79369f8aa12e83d2f510041ab2d (diff) | |
| download | platform_hardware_ril-59f891bd3eac10d9995815bac6e453a7b27eb0d8.tar.gz platform_hardware_ril-59f891bd3eac10d9995815bac6e453a7b27eb0d8.tar.bz2 platform_hardware_ril-59f891bd3eac10d9995815bac6e453a7b27eb0d8.zip | |
Merge "Use 32BIT nanopb library."
| -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, }, |