Revert "Delete atoms.proto from statsd"
Revert "Add android bp to proto_logging"
Revert submission 13070789-atomsproto
Reason for revert: Breaks multiple git_master-without-vendor targets
```
out/soong/.bootstrap/bin/soong_build -t -l out/.module_paths/Android.bp.list -b out/soong -n out -d out/soong/build.ninja.d -globFile out/soong/.bootstrap/build-globs.ninja -o out/soong/build.ninja Android.bp
error: frameworks/base/tools/stats_log_api_gen/Android.bp:49:1: "stats-log-api-gen-test" depends on undefined module "libstats_proto_host"
ninja: build stopped: subcommand failed.
```
Reverted Changes:
I184cf8bf8:Add android bp to proto_logging
I36ec354d2:Delete atoms.proto from statsd
Bug: 167962588
Change-Id: Idce97c5cf020473744eb7f96dcfbdc7677c094da
diff --git a/Android.bp b/Android.bp
index d9fe7cc..8164d6a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -912,17 +912,13 @@
name: "platformprotos",
srcs: [
":ipconnectivity-proto-src",
- ":libstats_internal_protos",
"cmds/am/proto/instrumentation_data.proto",
"cmds/statsd/src/**/*.proto",
"core/proto/**/*.proto",
"libs/incident/proto/**/*.proto",
],
proto: {
- include_dirs: [
- "external/protobuf/src",
- "frameworks/proto_logging/stats",
- ],
+ include_dirs: ["external/protobuf/src"],
type: "full",
},
// Protos have lots of MissingOverride and similar.