diff options
| author | Krzysztof Kosiński <krzysio@google.com> | 2024-03-15 23:08:34 +0000 |
|---|---|---|
| committer | Krzysztof Kosiński <krzysio@google.com> | 2024-03-15 23:11:14 +0000 |
| commit | f8423f6ee7dd0e5be9b63413c1f5a0cbcbced0f8 (patch) | |
| tree | 5a7695c4ae775876a28bf4e9a604a914890110b1 /boottime_tools | |
| parent | 0a775d8aead45c06dc1d2238901d5f4dc4089258 (diff) | |
| download | extras-f8423f6ee7dd0e5be9b63413c1f5a0cbcbced0f8.tar.gz | |
Fix incompatibilities with Protobuf 22.x.
- Add missing headers.
- Modify libjsonpb to be compatible with std::string_view usage
in Protobuf generated code.
Bug: 329747255
Test: presubmit
Change-Id: Ibeeb7b7dac66a7fb0189a1d13b36a853d3fcd3d4
Diffstat (limited to 'boottime_tools')
| -rw-r--r-- | boottime_tools/bootio/bootio_collector.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/boottime_tools/bootio/bootio_collector.cpp b/boottime_tools/bootio/bootio_collector.cpp index 037a3e2b..3c13055b 100644 --- a/boottime_tools/bootio/bootio_collector.cpp +++ b/boottime_tools/bootio/bootio_collector.cpp @@ -15,14 +15,20 @@ */ #include "bootio_collector.h" -#include <android-base/logging.h> + #include <android-base/file.h> +#include <android-base/logging.h> +#include <dirent.h> +#include <inttypes.h> #include <log/log.h> + +#include <map> +#include <memory> +#include <string> +#include <unordered_map> + #include "protos.pb.h" #include "time.h" -#include <unordered_map> -#include <inttypes.h> -#include <dirent.h> namespace android { |