Minimize changes between aosp and internal for src/android_internal
Follows ag/23263017.
This brings internal<>AOSP in a state where the only difference
is statsd.cc, empty in AOSP, full content in udc-dev and int-master.
Bug: 271926639
Change-Id: I181f3041454de5dd43ad8666a4fe1c6f6d2adcdd
diff --git a/Android.bp b/Android.bp
index 91b7f78..f4f9a2d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -689,6 +689,7 @@
"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 @@
"libincident",
"liblog",
"libservices",
+ "libstatspull",
"libstatssocket",
"libtracingproxy",
"libutils",
diff --git a/src/android_internal/BUILD.gn b/src/android_internal/BUILD.gn
index 8435eab..a175063 100644
--- a/src/android_internal/BUILD.gn
+++ b/src/android_internal/BUILD.gn
@@ -32,6 +32,7 @@
"health_hal.cc",
"incident_service.cc",
"power_stats.cc",
+ "statsd.cc",
"statsd_logging.cc",
"tracing_service_proxy.cc",
]
@@ -53,7 +54,7 @@
"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 0000000..e69de29
--- /dev/null
+++ b/src/android_internal/statsd.cc
