diff options
| author | Alex Light <allight@google.com> | 2020-11-24 21:22:52 +0000 |
|---|---|---|
| committer | Alex Light <allight@google.com> | 2020-11-24 21:25:39 +0000 |
| commit | 217301c36f7ffd500441cb879a4fa88b770092db (patch) | |
| tree | 07484accc25bd2cb66c44b17e87f9f8b981c3b94 /tools/stats_log_api_gen/Collation.cpp | |
| parent | 4e671568fef45f1489ab442dae55e9a6d37697d2 (diff) | |
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
Diffstat (limited to 'tools/stats_log_api_gen/Collation.cpp')
| -rw-r--r-- | tools/stats_log_api_gen/Collation.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/stats_log_api_gen/Collation.cpp b/tools/stats_log_api_gen/Collation.cpp index 56f4db0b2aed..fe6ca558a0ee 100644 --- a/tools/stats_log_api_gen/Collation.cpp +++ b/tools/stats_log_api_gen/Collation.cpp @@ -20,7 +20,7 @@ #include <map> -#include "frameworks/proto_logging/stats/atoms.pb.h" +#include "frameworks/base/cmds/statsd/src/atoms.pb.h" namespace android { namespace stats_log_api_gen { |