Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab1a6b31 authored by Chih-hung Hsieh's avatar Chih-hung Hsieh Committed by Android (Google) Code Review
Browse files

Merge "Use -Werror in frameworks/base/tools/streaming_proto"

parents b5f48b23 548fdbda

tools/streaming_proto/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -24,6 +24,10 @@ cc_defaults { 
        "stream_proto_utils.cpp",

        "string_utils.cpp",

    ],

    cflags: [

        "-Wall",

        "-Werror",

    ],



    shared_libs: ["libprotoc"],

}

tools/streaming_proto/stream_proto_utils.cpp

+0 −2
Original line number Diff line number Diff line
@@ -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;