diff --git a/cmds/statsd/Android.bp b/cmds/statsd/Android.bp index ef631611647ba..5c3d17e305859 100644 --- a/cmds/statsd/Android.bp +++ b/cmds/statsd/Android.bp @@ -196,10 +196,6 @@ cc_test { ], srcs: [ - // atom_field_options.proto needs field_options.proto, but that is - // not included in libprotobuf-cpp-lite, so compile it here. - ":libprotobuf-internal-protos", - "src/atom_field_options.proto", "src/atoms.proto", "src/stats_log.proto", @@ -249,11 +245,11 @@ cc_test { static_libs: ["libgmock"], proto: { - type: "lite", + type: "full", include_dirs: ["external/protobuf/src"], }, - shared_libs: ["libprotobuf-cpp-lite"], + shared_libs: ["libprotobuf-cpp-full"], } @@ -266,10 +262,6 @@ cc_benchmark { defaults: ["statsd_defaults"], srcs: [ - // atom_field_options.proto needs field_options.proto, but that is - // not included in libprotobuf-cpp-lite, so compile it here. - ":libprotobuf-internal-protos", - "src/atom_field_options.proto", "src/atoms.proto", "src/stats_log.proto", @@ -284,7 +276,7 @@ cc_benchmark { ], proto: { - type: "lite", + type: "full", include_dirs: ["external/protobuf/src"], }, @@ -302,7 +294,7 @@ cc_benchmark { shared_libs: [ "libgtest_prod", "libstatslog", - "libprotobuf-cpp-lite", + "libprotobuf-cpp-full", ], }