commit 0a70e536c14a3a52f15f87627d336973d56f9a82
author Colin Cross <ccross@android.com> Sun Nov 04 17:24:15 2018 -0800
committer android-build-team Robot <android-build-team-robot@google.com> Tue Nov 06 23:59:42 2018 +0000
tree e064a53d82f9ec057e6fceb1d49fdceeb41ce1c9
parent bd5efd346fed3928889d8b52af44bf182c6e4f14

Revert "Convert statsd_test and statsd_benchmark to proto lite"

This reverts commit e7908d7b624591c4cae55e66f5e603d061addd8f.

Change-Id: I585991ab1d5b35930bee6e32b82714aa11fbcb41
(cherry picked from commit 47046b80d25096b9b1aa822044b76a6cab054e6f)

cmds/statsd/Android.bp

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