Fix how we build the statsd protos.
This lets us include frameworks protos, and use the constants
and messages from them.
Change-Id: I609d6e524f780e6a5beea543a68561bede47813e
Test: make
diff --git a/Android.bp b/Android.bp
index 948b0a0..86b82e5 100644
--- a/Android.bp
+++ b/Android.bp
@@ -677,35 +677,23 @@
"-Werror",
"-Wno-unused-parameter",
],
+
+ srcs: [
+ "core/proto/**/*.proto",
+ "libs/incident/**/*.proto",
+ "tools/streaming_proto/stream.proto",
+ ],
+
target: {
host: {
proto: {
type: "full",
},
- srcs: [
- "core/proto/**/*.proto",
- "libs/incident/**/*.proto",
- "tools/streaming_proto/stream.proto",
- ],
},
android: {
proto: {
type: "lite",
},
- // We only build the protos that are optimized for the lite
- // runtime, as well as the only protos that are actually
- // needed by the device.
- srcs: [
- "core/proto/android/os/cpufreq.proto",
- "core/proto/android/os/cpuinfo.proto",
- "core/proto/android/os/kernelwake.proto",
- "core/proto/android/os/pagetypeinfo.proto",
- "core/proto/android/os/procrank.proto",
- "core/proto/android/os/system_properties.proto",
- "core/proto/android/service/graphicsstats.proto",
- "libs/incident/proto/android/privacy.proto",
- "tools/streaming_proto/stream.proto",
- ],
shared: {
enabled: false,
},