summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2018-11-04 17:45:26 -0800
committer android-build-merger <android-build-merger@google.com> 2018-11-04 17:45:26 -0800
commit5742f9ffa78633bcd3e486b94267ad288368fd57 (patch)
tree8e73db54cc247bff922517a4f55c6a8a933405bf
parentf4f1adbf8f7b2b8b21b4fdef523f0ee14e22cdb8 (diff)
parente7908d7b624591c4cae55e66f5e603d061addd8f (diff)
Convert statsd_test and statsd_benchmark to proto lite
am: e7908d7b62 Change-Id: Id43ecd7edc87c7e58dc194b7adbf8b48c70b5fc0
-rw-r--r--cmds/statsd/Android.bp16
1 files changed, 12 insertions, 4 deletions
diff --git a/cmds/statsd/Android.bp b/cmds/statsd/Android.bp
index 5c3d17e30585..ef631611647b 100644
--- a/cmds/statsd/Android.bp
+++ b/cmds/statsd/Android.bp
@@ -196,6 +196,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",
@@ -245,11 +249,11 @@ cc_test {
static_libs: ["libgmock"],
proto: {
- type: "full",
+ type: "lite",
include_dirs: ["external/protobuf/src"],
},
- shared_libs: ["libprotobuf-cpp-full"],
+ shared_libs: ["libprotobuf-cpp-lite"],
}
@@ -262,6 +266,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",
@@ -276,7 +284,7 @@ cc_benchmark {
],
proto: {
- type: "full",
+ type: "lite",
include_dirs: ["external/protobuf/src"],
},
@@ -294,7 +302,7 @@ cc_benchmark {
shared_libs: [
"libgtest_prod",
"libstatslog",
- "libprotobuf-cpp-full",
+ "libprotobuf-cpp-lite",
],
}