diff options
| author | 2017-12-06 17:08:46 +0000 | |
|---|---|---|
| committer | 2017-12-06 17:08:46 +0000 | |
| commit | ab1a6b31a7533450497f3f9a7847e6a1cd5226e1 (patch) | |
| tree | daa4afe51192cb37529f24b4917002a9fd12a2c9 | |
| parent | b5f48b2392c4e702a985ad88425ede9bcbf67a8c (diff) | |
| parent | 548fdbda19d327e2285e43bf72c136938dbe6817 (diff) | |
Merge "Use -Werror in frameworks/base/tools/streaming_proto"
| -rw-r--r-- | tools/streaming_proto/Android.bp | 4 | ||||
| -rw-r--r-- | tools/streaming_proto/stream_proto_utils.cpp | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tools/streaming_proto/Android.bp b/tools/streaming_proto/Android.bp index dc5c14e32cbd..4e9391db9a5b 100644 --- a/tools/streaming_proto/Android.bp +++ b/tools/streaming_proto/Android.bp @@ -24,6 +24,10 @@ cc_defaults { "stream_proto_utils.cpp", "string_utils.cpp", ], + cflags: [ + "-Wall", + "-Werror", + ], shared_libs: ["libprotoc"], } diff --git a/tools/streaming_proto/stream_proto_utils.cpp b/tools/streaming_proto/stream_proto_utils.cpp index e8f86bc0be83..fb2d98d45b0e 100644 --- a/tools/streaming_proto/stream_proto_utils.cpp +++ b/tools/streaming_proto/stream_proto_utils.cpp @@ -13,8 +13,6 @@ const uint64_t FIELD_TYPE_SHIFT = 32; // TODO: packed is not supported yet. // const uint64_t FIELD_COUNT_SHIFT = 40; -const uint64_t FIELD_COUNT_MASK = 0x0fULL << FIELD_COUNT_SHIFT; -const uint64_t FIELD_COUNT_UNKNOWN = 0; const uint64_t FIELD_COUNT_SINGLE = 1ULL << FIELD_COUNT_SHIFT; const uint64_t FIELD_COUNT_REPEATED = 2ULL << FIELD_COUNT_SHIFT; const uint64_t FIELD_COUNT_PACKED = 5ULL << FIELD_COUNT_SHIFT; |