Convert statsd_test and statsd_benchmark to proto lite am: e7908d7b62 am: 5742f9ffa7

am: 85201e02df

Change-Id: Id99366ec5900c71ba712dbee99fbefb5b785b827

1 files changed, 12 insertions, 4 deletions

diff --git a/cmds/statsd/Android.bp b/cmds/statsd/Android.bp
index a3cd8a3bb32b..6547b3ad7ad5 100644
--- a/cmds/statsd/Android.bp
+++ b/cmds/statsd/Android.bp
@@ -205,6 +205,10 @@ 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",
@@ -259,11 +263,11 @@ cc_test {
     ],
 
     proto: {
-        type: "full",
+        type: "lite",
         include_dirs: ["external/protobuf/src"],
     },
 
-    shared_libs: ["libprotobuf-cpp-full"],
+    shared_libs: ["libprotobuf-cpp-lite"],
 
 }
 
@@ -276,6 +280,10 @@ 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",
@@ -290,7 +298,7 @@ cc_benchmark {
     ],
 
     proto: {
-        type: "full",
+        type: "lite",
         include_dirs: ["external/protobuf/src"],
     },
 
@@ -312,7 +320,7 @@ cc_benchmark {
     shared_libs: [
         "libgtest_prod",
         "libstatslog",
-        "libprotobuf-cpp-full",
+        "libprotobuf-cpp-lite",
     ],
 }