summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2018-11-04 18:08:27 -0800
committer android-build-merger <android-build-merger@google.com> 2018-11-04 18:08:27 -0800
commit85201e02df73cad2e1093b30a8c6350efe87ff09 (patch)
treea0387ffb38296e5a18821977f245914316d6ee96
parent2ed56610e8798e6de5929d5d3a4ad4eccf9459fd (diff)
parent5742f9ffa78633bcd3e486b94267ad288368fd57 (diff)
Convert statsd_test and statsd_benchmark to proto lite am: e7908d7b62
am: 5742f9ffa7 Change-Id: I5ef22cce9bbebe4355915ae3ab158faf14bf2708
-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",
],
}