Refactor imports to packages/modules/StatsD
Define statsd-protos filegroup for reference
in frameworks/base:platformprotos
BUG: 167962588
TEST: TH
TEST: Local build [ m com.android.os.statsd ]
Change-Id: I16e3d9878129037c0e2a53296f6abea77d67eabf
diff --git a/bin/Android.bp b/bin/Android.bp
index 5c7cdd2..a39d4fc 100644
--- a/bin/Android.bp
+++ b/bin/Android.bp
@@ -406,3 +406,18 @@
name: "statsd-config-proto-def",
srcs: ["src/statsd_config.proto"],
}
+
+// Filegroup for all statsd protos
+filegroup {
+ name: "statsd_internal_protos",
+ srcs: [
+ "src/active_config_list.proto",
+ "src/experiment_ids.proto",
+ "src/shell/shell_config.proto",
+ "src/shell/shell_data.proto",
+ "src/statsd_config.proto",
+ "src/statsd_metadata.proto",
+ "src/stats_log.proto",
+ "src/uid_data.proto",
+ ],
+}
diff --git a/bin/benchmark/metric_util.h b/bin/benchmark/metric_util.h
index 3efaa85..69b8a31 100644
--- a/bin/benchmark/metric_util.h
+++ b/bin/benchmark/metric_util.h
@@ -14,8 +14,8 @@
#pragma once
-#include "frameworks/base/cmds/statsd/src/stats_log.pb.h"
-#include "frameworks/base/cmds/statsd/src/statsd_config.pb.h"
+#include "packages/modules/StatsD/bin/src/stats_log.pb.h"
+#include "packages/modules/StatsD/bin/src/statsd_config.pb.h"
#include "src/StatsLogProcessor.h"
#include "src/logd/LogEvent.h"
#include "stats_event.h"
diff --git a/bin/src/FieldValue.h b/bin/src/FieldValue.h
index fd86e36..2a293fa 100644
--- a/bin/src/FieldValue.h
+++ b/bin/src/FieldValue.h
@@ -15,7 +15,7 @@
*/
#pragma once
-#include "frameworks/base/cmds/statsd/src/statsd_config.pb.h"
+#include "packages/modules/StatsD/bin/src/statsd_config.pb.h"
#include "annotations.h"
namespace android {
diff --git a/bin/src/StatsLogProcessor.cpp b/bin/src/StatsLogProcessor.cpp
index b7f23a6..dbb3135 100644
--- a/bin/src/StatsLogProcessor.cpp
+++ b/bin/src/StatsLogProcessor.cpp
@@ -21,8 +21,8 @@
#include <android-base/file.h>
#include <cutils/multiuser.h>
-#include <frameworks/base/cmds/statsd/src/active_config_list.pb.h>
-#include <frameworks/base/cmds/statsd/src/experiment_ids.pb.h>
+#include <packages/modules/StatsD/bin/src/active_config_list.pb.h>
+#include <packages/modules/StatsD/bin/src/experiment_ids.pb.h>
#include "android-base/stringprintf.h"
#include "external/StatsPullerManager.h"
diff --git a/bin/src/StatsLogProcessor.h b/bin/src/StatsLogProcessor.h
index 2384ed8..c27b36e 100644
--- a/bin/src/StatsLogProcessor.h
+++ b/bin/src/StatsLogProcessor.h
@@ -23,8 +23,8 @@
#include "packages/UidMap.h"
#include "external/StatsPullerManager.h"
-#include "frameworks/base/cmds/statsd/src/statsd_config.pb.h"
-#include "frameworks/base/cmds/statsd/src/statsd_metadata.pb.h"
+#include "packages/modules/StatsD/bin/src/statsd_config.pb.h"
+#include "packages/modules/StatsD/bin/src/statsd_metadata.pb.h"
#include <stdio.h>
#include <unordered_map>
diff --git a/bin/src/StatsService.cpp b/bin/src/StatsService.cpp
index fa5b4d1..339761e 100644
--- a/bin/src/StatsService.cpp
+++ b/bin/src/StatsService.cpp
@@ -29,8 +29,8 @@
#include <android-base/file.h>
#include <android-base/strings.h>
#include <cutils/multiuser.h>
-#include <frameworks/base/cmds/statsd/src/statsd_config.pb.h>
-#include <frameworks/base/cmds/statsd/src/uid_data.pb.h>
+#include <packages/modules/StatsD/bin/src/statsd_config.pb.h>
+#include <packages/modules/StatsD/bin/src/uid_data.pb.h>
#include <private/android_filesystem_config.h>
#include <statslog_statsd.h>
#include <stdio.h>
diff --git a/bin/src/anomaly/AlarmTracker.h b/bin/src/anomaly/AlarmTracker.h
index 2da4a18..aa37192 100644
--- a/bin/src/anomaly/AlarmTracker.h
+++ b/bin/src/anomaly/AlarmTracker.h
@@ -20,7 +20,7 @@
#include "AlarmMonitor.h"
#include "config/ConfigKey.h"
-#include "frameworks/base/cmds/statsd/src/statsd_config.pb.h" // Alarm
+#include "packages/modules/StatsD/bin/src/statsd_config.pb.h" // Alarm
#include <stdlib.h>
#include <utils/RefBase.h>
diff --git a/bin/src/anomaly/AnomalyTracker.h b/bin/src/anomaly/AnomalyTracker.h
index bf36a3b..e5893a4 100644
--- a/bin/src/anomaly/AnomalyTracker.h
+++ b/bin/src/anomaly/AnomalyTracker.h
@@ -23,8 +23,8 @@
#include "AlarmMonitor.h"
#include "config/ConfigKey.h"
-#include "frameworks/base/cmds/statsd/src/statsd_config.pb.h" // Alert
-#include "frameworks/base/cmds/statsd/src/statsd_metadata.pb.h" // AlertMetadata
+#include "packages/modules/StatsD/bin/src/statsd_config.pb.h" // Alert
+#include "packages/modules/StatsD/bin/src/statsd_metadata.pb.h" // AlertMetadata
#include "stats_util.h" // HashableDimensionKey and DimToValMap
namespace android {
diff --git a/bin/src/anomaly/subscriber_util.h b/bin/src/anomaly/subscriber_util.h
index 1df3c89..7069b72 100644
--- a/bin/src/anomaly/subscriber_util.h
+++ b/bin/src/anomaly/subscriber_util.h
@@ -18,7 +18,7 @@
#include "config/ConfigKey.h"
#include "HashableDimensionKey.h"
-#include "frameworks/base/cmds/statsd/src/statsd_config.pb.h"
+#include "packages/modules/StatsD/bin/src/statsd_config.pb.h"
namespace android {
namespace os {
diff --git a/bin/src/condition/CombinationConditionTracker.h b/bin/src/condition/CombinationConditionTracker.h
index 39ff0ab..0c598c2 100644
--- a/bin/src/condition/CombinationConditionTracker.h
+++ b/bin/src/condition/CombinationConditionTracker.h
@@ -18,7 +18,7 @@
#define COMBINATION_CONDITION_TRACKER_H
#include "ConditionTracker.h"
-#include "frameworks/base/cmds/statsd/src/statsd_config.pb.h"
+#include "packages/modules/StatsD/bin/src/statsd_config.pb.h"
namespace android {
namespace os {
diff --git a/bin/src/condition/ConditionTracker.h b/bin/src/condition/ConditionTracker.h
index 62736c8..b8448f7 100644
--- a/bin/src/condition/ConditionTracker.h
+++ b/bin/src/condition/ConditionTracker.h
@@ -17,7 +17,7 @@
#pragma once
#include "condition/condition_util.h"
-#include "frameworks/base/cmds/statsd/src/statsd_config.pb.h"
+#include "packages/modules/StatsD/bin/src/statsd_config.pb.h"
#include "matchers/LogMatchingTracker.h"
#include "matchers/matcher_util.h"
diff --git a/bin/src/condition/SimpleConditionTracker.h b/bin/src/condition/SimpleConditionTracker.h
index ea7f87b..d576b21 100644
--- a/bin/src/condition/SimpleConditionTracker.h
+++ b/bin/src/condition/SimpleConditionTracker.h
@@ -20,7 +20,7 @@
#include <gtest/gtest_prod.h>
#include "ConditionTracker.h"
#include "config/ConfigKey.h"
-#include "frameworks/base/cmds/statsd/src/statsd_config.pb.h"
+#include "packages/modules/StatsD/bin/src/statsd_config.pb.h"
#include "stats_util.h"
namespace android {
diff --git a/bin/src/condition/condition_util.cpp b/bin/src/condition/condition_util.cpp
index 60b8c53..92f0748 100644
--- a/bin/src/condition/condition_util.cpp
+++ b/bin/src/condition/condition_util.cpp
@@ -20,7 +20,7 @@
#include "../matchers/matcher_util.h"
#include "ConditionTracker.h"
-#include "frameworks/base/cmds/statsd/src/statsd_config.pb.h"
+#include "packages/modules/StatsD/bin/src/statsd_config.pb.h"
#include "stats_util.h"
namespace android {
diff --git a/bin/src/condition/condition_util.h b/bin/src/condition/condition_util.h
index fed90ec..8969446 100644
--- a/bin/src/condition/condition_util.h
+++ b/bin/src/condition/condition_util.h
@@ -19,7 +19,7 @@
#include <vector>
#include "../matchers/matcher_util.h"
-#include "frameworks/base/cmds/statsd/src/statsd_config.pb.h"
+#include "packages/modules/StatsD/bin/src/statsd_config.pb.h"
namespace android {
namespace os {
diff --git a/bin/src/config/ConfigKey.h b/bin/src/config/ConfigKey.h
index 4cc9393..5cd010c 100644
--- a/bin/src/config/ConfigKey.h
+++ b/bin/src/config/ConfigKey.h
@@ -16,7 +16,7 @@
#pragma once
-#include "frameworks/base/cmds/statsd/src/statsd_config.pb.h"
+#include "packages/modules/StatsD/bin/src/statsd_config.pb.h"
#include <string>
diff --git a/bin/src/external/Perfetto.cpp b/bin/src/external/Perfetto.cpp
index 85b660e..e714c23 100644
--- a/bin/src/external/Perfetto.cpp
+++ b/bin/src/external/Perfetto.cpp
@@ -18,7 +18,7 @@
#include "config/ConfigKey.h"
#include "Log.h"
-#include "frameworks/base/cmds/statsd/src/statsd_config.pb.h" // Alert
+#include "packages/modules/StatsD/bin/src/statsd_config.pb.h" // Alert
#include <android-base/unique_fd.h>
#include <inttypes.h>
diff --git a/bin/src/matchers/CombinationLogMatchingTracker.h b/bin/src/matchers/CombinationLogMatchingTracker.h
index 55bc460..e949215 100644
--- a/bin/src/matchers/CombinationLogMatchingTracker.h
+++ b/bin/src/matchers/CombinationLogMatchingTracker.h
@@ -19,7 +19,7 @@
#include <unordered_map>
#include <vector>
#include "LogMatchingTracker.h"
-#include "frameworks/base/cmds/statsd/src/statsd_config.pb.h"
+#include "packages/modules/StatsD/bin/src/statsd_config.pb.h"
namespace android {
namespace os {
diff --git a/bin/src/matchers/LogMatchingTracker.h b/bin/src/matchers/LogMatchingTracker.h
index 88ab4e6..77f0b99 100644
--- a/bin/src/matchers/LogMatchingTracker.h
+++ b/bin/src/matchers/LogMatchingTracker.h
@@ -17,7 +17,7 @@
#ifndef LOG_MATCHING_TRACKER_H
#define LOG_MATCHING_TRACKER_H
-#include "frameworks/base/cmds/statsd/src/statsd_config.pb.h"
+#include "packages/modules/StatsD/bin/src/statsd_config.pb.h"
#include "logd/LogEvent.h"
#include "matchers/matcher_util.h"
diff --git a/bin/src/matchers/SimpleLogMatchingTracker.h b/bin/src/matchers/SimpleLogMatchingTracker.h
index a0f6a88..ca9200b 100644
--- a/bin/src/matchers/SimpleLogMatchingTracker.h
+++ b/bin/src/matchers/SimpleLogMatchingTracker.h
@@ -20,7 +20,7 @@
#include <unordered_map>
#include <vector>
#include "LogMatchingTracker.h"
-#include "frameworks/base/cmds/statsd/src/statsd_config.pb.h"
+#include "packages/modules/StatsD/bin/src/statsd_config.pb.h"
#include "packages/UidMap.h"
namespace android {
diff --git a/bin/src/matchers/matcher_util.cpp b/bin/src/matchers/matcher_util.cpp
index 2b4c6a3..6b2fdfd 100644
--- a/bin/src/matchers/matcher_util.cpp
+++ b/bin/src/matchers/matcher_util.cpp
@@ -16,7 +16,7 @@
#define DEBUG false // STOPSHIP if true
#include "Log.h"
-#include "frameworks/base/cmds/statsd/src/statsd_config.pb.h"
+#include "packages/modules/StatsD/bin/src/statsd_config.pb.h"
#include "matchers/LogMatchingTracker.h"
#include "matchers/matcher_util.h"
#include "stats_util.h"
diff --git a/bin/src/matchers/matcher_util.h b/bin/src/matchers/matcher_util.h
index 1ab3e87..7493d5d 100644
--- a/bin/src/matchers/matcher_util.h
+++ b/bin/src/matchers/matcher_util.h
@@ -19,7 +19,7 @@
#include "logd/LogEvent.h"
#include <vector>
-#include "frameworks/base/cmds/statsd/src/statsd_config.pb.h"
+#include "packages/modules/StatsD/bin/src/statsd_config.pb.h"
#include "packages/UidMap.h"
#include "stats_util.h"
diff --git a/bin/src/metadata_util.h b/bin/src/metadata_util.h
index 84a39ff..e1381fa 100644
--- a/bin/src/metadata_util.h
+++ b/bin/src/metadata_util.h
@@ -15,7 +15,7 @@
*/
#include "HashableDimensionKey.h"
-#include "frameworks/base/cmds/statsd/src/statsd_metadata.pb.h" // AlertMetadata
+#include "packages/modules/StatsD/bin/src/statsd_metadata.pb.h" // AlertMetadata
namespace android {
namespace os {
diff --git a/bin/src/metrics/CountMetricProducer.h b/bin/src/metrics/CountMetricProducer.h
index f05fb06..5399c34 100644
--- a/bin/src/metrics/CountMetricProducer.h
+++ b/bin/src/metrics/CountMetricProducer.h
@@ -25,7 +25,7 @@
#include "MetricProducer.h"
#include "anomaly/AnomalyTracker.h"
#include "condition/ConditionTracker.h"
-#include "frameworks/base/cmds/statsd/src/statsd_config.pb.h"
+#include "packages/modules/StatsD/bin/src/statsd_config.pb.h"
#include "matchers/matcher_util.h"
#include "stats_util.h"
diff --git a/bin/src/metrics/DurationMetricProducer.h b/bin/src/metrics/DurationMetricProducer.h
index bfe1010..b46fb1f 100644
--- a/bin/src/metrics/DurationMetricProducer.h
+++ b/bin/src/metrics/DurationMetricProducer.h
@@ -27,7 +27,7 @@
#include "duration_helper/DurationTracker.h"
#include "duration_helper/MaxDurationTracker.h"
#include "duration_helper/OringDurationTracker.h"
-#include "frameworks/base/cmds/statsd/src/statsd_config.pb.h"
+#include "packages/modules/StatsD/bin/src/statsd_config.pb.h"
#include "stats_util.h"
using namespace std;
diff --git a/bin/src/metrics/EventMetricProducer.h b/bin/src/metrics/EventMetricProducer.h
index bfb2de3..f6fbadc 100644
--- a/bin/src/metrics/EventMetricProducer.h
+++ b/bin/src/metrics/EventMetricProducer.h
@@ -24,7 +24,7 @@
#include "../condition/ConditionTracker.h"
#include "../matchers/matcher_util.h"
#include "MetricProducer.h"
-#include "frameworks/base/cmds/statsd/src/statsd_config.pb.h"
+#include "packages/modules/StatsD/bin/src/statsd_config.pb.h"
#include "stats_util.h"
namespace android {
diff --git a/bin/src/metrics/GaugeMetricProducer.h b/bin/src/metrics/GaugeMetricProducer.h
index 2fc772b..0a6739b 100644
--- a/bin/src/metrics/GaugeMetricProducer.h
+++ b/bin/src/metrics/GaugeMetricProducer.h
@@ -26,7 +26,7 @@
#include "../matchers/matcher_util.h"
#include "../matchers/EventMatcherWizard.h"
#include "MetricProducer.h"
-#include "frameworks/base/cmds/statsd/src/statsd_config.pb.h"
+#include "packages/modules/StatsD/bin/src/statsd_config.pb.h"
#include "../stats_util.h"
namespace android {
diff --git a/bin/src/metrics/MetricProducer.h b/bin/src/metrics/MetricProducer.h
index be4cd67..d1ea0a4 100644
--- a/bin/src/metrics/MetricProducer.h
+++ b/bin/src/metrics/MetricProducer.h
@@ -17,7 +17,7 @@
#ifndef METRIC_PRODUCER_H
#define METRIC_PRODUCER_H
-#include <frameworks/base/cmds/statsd/src/active_config_list.pb.h>
+#include <packages/modules/StatsD/bin/src/active_config_list.pb.h>
#include <utils/RefBase.h>
#include <unordered_map>
diff --git a/bin/src/metrics/MetricsManager.h b/bin/src/metrics/MetricsManager.h
index ad30a88..d17a1a8 100644
--- a/bin/src/metrics/MetricsManager.h
+++ b/bin/src/metrics/MetricsManager.h
@@ -22,8 +22,8 @@
#include "condition/ConditionTracker.h"
#include "config/ConfigKey.h"
#include "external/StatsPullerManager.h"
-#include "frameworks/base/cmds/statsd/src/statsd_config.pb.h"
-#include "frameworks/base/cmds/statsd/src/statsd_metadata.pb.h"
+#include "packages/modules/StatsD/bin/src/statsd_config.pb.h"
+#include "packages/modules/StatsD/bin/src/statsd_metadata.pb.h"
#include "logd/LogEvent.h"
#include "matchers/LogMatchingTracker.h"
#include "metrics/MetricProducer.h"
diff --git a/bin/src/metrics/ValueMetricProducer.h b/bin/src/metrics/ValueMetricProducer.h
index e72002e..292b1ec 100644
--- a/bin/src/metrics/ValueMetricProducer.h
+++ b/bin/src/metrics/ValueMetricProducer.h
@@ -25,7 +25,7 @@
#include "matchers/EventMatcherWizard.h"
#include "stats_log_util.h"
#include "MetricProducer.h"
-#include "frameworks/base/cmds/statsd/src/statsd_config.pb.h"
+#include "packages/modules/StatsD/bin/src/statsd_config.pb.h"
namespace android {
namespace os {
diff --git a/bin/src/shell/ShellSubscriber.h b/bin/src/shell/ShellSubscriber.h
index 4c05fa7..49bae11 100644
--- a/bin/src/shell/ShellSubscriber.h
+++ b/bin/src/shell/ShellSubscriber.h
@@ -24,8 +24,8 @@
#include <thread>
#include "external/StatsPullerManager.h"
-#include "frameworks/base/cmds/statsd/src/shell/shell_config.pb.h"
-#include "frameworks/base/cmds/statsd/src/statsd_config.pb.h"
+#include "packages/modules/StatsD/bin/src/shell/shell_config.pb.h"
+#include "packages/modules/StatsD/bin/src/statsd_config.pb.h"
#include "logd/LogEvent.h"
#include "packages/UidMap.h"
diff --git a/bin/src/shell/shell_config.proto b/bin/src/shell/shell_config.proto
index 07d0310..58db05b 100644
--- a/bin/src/shell/shell_config.proto
+++ b/bin/src/shell/shell_config.proto
@@ -21,7 +21,7 @@
option java_package = "com.android.os";
option java_outer_classname = "ShellConfig";
-import "frameworks/base/cmds/statsd/src/statsd_config.proto";
+import "packages/modules/StatsD/bin/src/statsd_config.proto";
message PulledAtomSubscription {
optional SimpleAtomMatcher matcher = 1;
diff --git a/bin/src/stats_log_util.h b/bin/src/stats_log_util.h
index eb65dc6..769154b 100644
--- a/bin/src/stats_log_util.h
+++ b/bin/src/stats_log_util.h
@@ -20,7 +20,7 @@
#include "FieldValue.h"
#include "HashableDimensionKey.h"
-#include "frameworks/base/cmds/statsd/src/statsd_config.pb.h"
+#include "packages/modules/StatsD/bin/src/statsd_config.pb.h"
#include "guardrail/StatsdStats.h"
#include "logd/LogEvent.h"
diff --git a/bin/src/subscriber/IncidentdReporter.h b/bin/src/subscriber/IncidentdReporter.h
index e78a4d9..d0b72f2 100644
--- a/bin/src/subscriber/IncidentdReporter.h
+++ b/bin/src/subscriber/IncidentdReporter.h
@@ -18,7 +18,7 @@
#include "HashableDimensionKey.h"
#include "config/ConfigKey.h"
-#include "frameworks/base/cmds/statsd/src/statsd_config.pb.h" // Alert, IncidentdDetails
+#include "packages/modules/StatsD/bin/src/statsd_config.pb.h" // Alert, IncidentdDetails
namespace android {
namespace os {
diff --git a/bin/src/subscriber/SubscriberReporter.h b/bin/src/subscriber/SubscriberReporter.h
index 4fe4281..7699e18 100644
--- a/bin/src/subscriber/SubscriberReporter.h
+++ b/bin/src/subscriber/SubscriberReporter.h
@@ -21,7 +21,7 @@
#include <utils/String16.h>
#include "config/ConfigKey.h"
-#include "frameworks/base/cmds/statsd/src/statsd_config.pb.h" // subscription
+#include "packages/modules/StatsD/bin/src/statsd_config.pb.h" // subscription
#include "HashableDimensionKey.h"
#include <mutex>
diff --git a/bin/tests/FieldValue_test.cpp b/bin/tests/FieldValue_test.cpp
index a21eb9b..300a454 100644
--- a/bin/tests/FieldValue_test.cpp
+++ b/bin/tests/FieldValue_test.cpp
@@ -15,8 +15,8 @@
*/
#include <gtest/gtest.h>
-#include "frameworks/base/cmds/statsd/src/stats_log.pb.h"
-#include "frameworks/base/cmds/statsd/src/statsd_config.pb.h"
+#include "packages/modules/StatsD/bin/src/stats_log.pb.h"
+#include "packages/modules/StatsD/bin/src/statsd_config.pb.h"
#include "matchers/matcher_util.h"
#include "src/logd/LogEvent.h"
#include "stats_event.h"
diff --git a/bin/tests/HashableDimensionKey_test.cpp b/bin/tests/HashableDimensionKey_test.cpp
index 29adcd0..eaa22bf 100644
--- a/bin/tests/HashableDimensionKey_test.cpp
+++ b/bin/tests/HashableDimensionKey_test.cpp
@@ -17,7 +17,7 @@
#include <gtest/gtest.h>
-#include "frameworks/base/cmds/statsd/src/statsd_config.pb.h"
+#include "packages/modules/StatsD/bin/src/statsd_config.pb.h"
#include "statsd_test_util.h"
#ifdef __ANDROID__
diff --git a/bin/tests/LogEntryMatcher_test.cpp b/bin/tests/LogEntryMatcher_test.cpp
index 6264c07..00fa55f 100644
--- a/bin/tests/LogEntryMatcher_test.cpp
+++ b/bin/tests/LogEntryMatcher_test.cpp
@@ -16,7 +16,7 @@
#include <stdio.h>
#include "annotations.h"
-#include "frameworks/base/cmds/statsd/src/statsd_config.pb.h"
+#include "packages/modules/StatsD/bin/src/statsd_config.pb.h"
#include "matchers/matcher_util.h"
#include "stats_event.h"
#include "stats_log_util.h"
diff --git a/bin/tests/MetricsManager_test.cpp b/bin/tests/MetricsManager_test.cpp
index 6259757..aa562f1 100644
--- a/bin/tests/MetricsManager_test.cpp
+++ b/bin/tests/MetricsManager_test.cpp
@@ -20,7 +20,7 @@
#include <unordered_map>
#include <vector>
-#include "frameworks/base/cmds/statsd/src/statsd_config.pb.h"
+#include "packages/modules/StatsD/bin/src/statsd_config.pb.h"
#include "metrics/metrics_test_helper.h"
#include "src/condition/ConditionTracker.h"
#include "src/matchers/LogMatchingTracker.h"
diff --git a/bin/tests/StatsLogProcessor_test.cpp b/bin/tests/StatsLogProcessor_test.cpp
index 1e6680c..5d3e2f1 100644
--- a/bin/tests/StatsLogProcessor_test.cpp
+++ b/bin/tests/StatsLogProcessor_test.cpp
@@ -20,8 +20,8 @@
#include "StatsService.h"
#include "config/ConfigKey.h"
-#include "frameworks/base/cmds/statsd/src/stats_log.pb.h"
-#include "frameworks/base/cmds/statsd/src/statsd_config.pb.h"
+#include "packages/modules/StatsD/bin/src/stats_log.pb.h"
+#include "packages/modules/StatsD/bin/src/statsd_config.pb.h"
#include "guardrail/StatsdStats.h"
#include "logd/LogEvent.h"
#include "packages/UidMap.h"
diff --git a/bin/tests/StatsService_test.cpp b/bin/tests/StatsService_test.cpp
index cc38c4a..a574c58 100644
--- a/bin/tests/StatsService_test.cpp
+++ b/bin/tests/StatsService_test.cpp
@@ -14,7 +14,7 @@
#include "StatsService.h"
#include "config/ConfigKey.h"
-#include "frameworks/base/cmds/statsd/src/statsd_config.pb.h"
+#include "packages/modules/StatsD/bin/src/statsd_config.pb.h"
#include <android/binder_interface_utils.h>
#include <gmock/gmock.h>
diff --git a/bin/tests/condition/CombinationConditionTracker_test.cpp b/bin/tests/condition/CombinationConditionTracker_test.cpp
index 1d501fd..3f3f9a8 100644
--- a/bin/tests/condition/CombinationConditionTracker_test.cpp
+++ b/bin/tests/condition/CombinationConditionTracker_test.cpp
@@ -13,7 +13,7 @@
// limitations under the License.
#include "condition/condition_util.h"
-#include "frameworks/base/cmds/statsd/src/statsd_config.pb.h"
+#include "packages/modules/StatsD/bin/src/statsd_config.pb.h"
#include <gtest/gtest.h>
diff --git a/bin/tests/e2e/Anomaly_count_e2e_test.cpp b/bin/tests/e2e/Anomaly_count_e2e_test.cpp
index af9436b..e6d8128 100644
--- a/bin/tests/e2e/Anomaly_count_e2e_test.cpp
+++ b/bin/tests/e2e/Anomaly_count_e2e_test.cpp
@@ -14,7 +14,7 @@
#include <gtest/gtest.h>
-#include "frameworks/base/cmds/statsd/src/statsd_metadata.pb.h"
+#include "packages/modules/StatsD/bin/src/statsd_metadata.pb.h"
#include "src/StatsLogProcessor.h"
#include "src/stats_log_util.h"
#include "tests/statsd_test_util.h"
diff --git a/bin/tests/shell/ShellSubscriber_test.cpp b/bin/tests/shell/ShellSubscriber_test.cpp
index 1ba8593..7b131fc 100644
--- a/bin/tests/shell/ShellSubscriber_test.cpp
+++ b/bin/tests/shell/ShellSubscriber_test.cpp
@@ -20,8 +20,8 @@
#include <vector>
-#include "frameworks/base/cmds/statsd/src/shell/shell_config.pb.h"
-#include "frameworks/base/cmds/statsd/src/shell/shell_data.pb.h"
+#include "packages/modules/StatsD/bin/src/shell/shell_config.pb.h"
+#include "packages/modules/StatsD/bin/src/shell/shell_data.pb.h"
#include "frameworks/proto_logging/stats/atoms.pb.h"
#include "stats_event.h"
#include "tests/metrics/metrics_test_helper.h"
diff --git a/bin/tests/statsd_test_util.h b/bin/tests/statsd_test_util.h
index 3dcf4ec..eb2f294 100644
--- a/bin/tests/statsd_test_util.h
+++ b/bin/tests/statsd_test_util.h
@@ -20,8 +20,8 @@
#include <gmock/gmock.h>
#include <gtest/gtest.h>
-#include "frameworks/base/cmds/statsd/src/stats_log.pb.h"
-#include "frameworks/base/cmds/statsd/src/statsd_config.pb.h"
+#include "packages/modules/StatsD/bin/src/stats_log.pb.h"
+#include "packages/modules/StatsD/bin/src/statsd_config.pb.h"
#include "src/StatsLogProcessor.h"
#include "src/hash.h"
#include "src/logd/LogEvent.h"
