diff options
| author | Hector Dearman <hjd@google.com> | 2023-05-17 10:21:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-05-17 10:21:48 +0000 |
| commit | bad11ba2234a116bafcce7910d8bad375584c5d1 (patch) | |
| tree | d32c0308a376b07da0d3275bf880773a07bdddc3 | |
| parent | 06ea518ef4373ccb1acaf75e833537ee7f1f5fa8 (diff) | |
| parent | 8d0cb6f40da39835994a9a41c5b471f252c182a2 (diff) | |
| download | perfetto-bad11ba2234a116bafcce7910d8bad375584c5d1.tar.gz | |
Merge "Minimize changes between aosp and internal for src/android_internal"
| -rw-r--r-- | Android.bp | 2 | ||||
| -rw-r--r-- | src/android_internal/BUILD.gn | 3 | ||||
| -rw-r--r-- | src/android_internal/statsd.cc | 0 |
3 files changed, 4 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp index 91b7f78e0..f4f9a2d09 100644 --- a/Android.bp +++ b/Android.bp @@ -689,6 +689,7 @@ cc_library_shared { "src/android_internal/health_hal.cc", "src/android_internal/incident_service.cc", "src/android_internal/power_stats.cc", + "src/android_internal/statsd.cc", "src/android_internal/statsd_logging.cc", "src/android_internal/tracing_service_proxy.cc", ], @@ -706,6 +707,7 @@ cc_library_shared { "libincident", "liblog", "libservices", + "libstatspull", "libstatssocket", "libtracingproxy", "libutils", diff --git a/src/android_internal/BUILD.gn b/src/android_internal/BUILD.gn index 8435eab7f..a175063c2 100644 --- a/src/android_internal/BUILD.gn +++ b/src/android_internal/BUILD.gn @@ -32,6 +32,7 @@ if (perfetto_build_with_android) { "health_hal.cc", "incident_service.cc", "power_stats.cc", + "statsd.cc", "statsd_logging.cc", "tracing_service_proxy.cc", ] @@ -53,7 +54,7 @@ if (perfetto_build_with_android) { "services", "tracingproxy", "utils", - "libstatspull", + "statspull", ] # This target should never depend on any other perfetto target to avoid ODR diff --git a/src/android_internal/statsd.cc b/src/android_internal/statsd.cc new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/src/android_internal/statsd.cc |