Gitiles
Code Review Sign In
review.blissroms.org / platform_system_core_old / 80f087c280a85f3485471dd0452817477d8bef1c^1..80f087c280a85f3485471dd0452817477d8bef1c / .
commit80f087c280a85f3485471dd0452817477d8bef1c[log] [tgz]
authorGaurav Shah <gauravsh@google.com>Mon Aug 10 22:54:25 2015 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>Mon Aug 10 22:54:25 2015 +0000
tree57f5b5e846d16f57b541fb6f7425a9ce5ca6ed0b
parent2632c4efb96378b0a182960e6039fdc494c26738 [diff]
parent9e1073105af0b5bf037331d9d5a1f368c454b0a9 [diff]
am 795ad6c7: am f06041d7: Merge "metricsd: Rename metrics to metricsd."

* commit '795ad6c74488f8f9f202010be4a0b3df30d2d0de':
  metricsd: Rename metrics to metricsd.

diff --git a/metrics/MODULE_LICENSE_BSD b/metricsd/MODULE_LICENSE_BSD
similarity index 100%
rename from metrics/MODULE_LICENSE_BSD
rename to metricsd/MODULE_LICENSE_BSD

diff --git a/metrics/NOTICE b/metricsd/NOTICE
similarity index 100%
rename from metrics/NOTICE
rename to metricsd/NOTICE

diff --git a/metrics/OWNERS b/metricsd/OWNERS
similarity index 100%
rename from metrics/OWNERS
rename to metricsd/OWNERS

diff --git a/metrics/README b/metricsd/README
similarity index 100%
rename from metrics/README
rename to metricsd/README

diff --git a/metrics/WATCHLISTS b/metricsd/WATCHLISTS
similarity index 100%
rename from metrics/WATCHLISTS
rename to metricsd/WATCHLISTS

diff --git a/metrics/c_metrics_library.cc b/metricsd/c_metrics_library.cc
similarity index 100%
rename from metrics/c_metrics_library.cc
rename to metricsd/c_metrics_library.cc

diff --git a/metrics/constants.h b/metricsd/constants.h
similarity index 100%
rename from metrics/constants.h
rename to metricsd/constants.h

diff --git a/metrics/include/metrics/c_metrics_library.h b/metricsd/include/metrics/c_metrics_library.h
similarity index 100%
rename from metrics/include/metrics/c_metrics_library.h
rename to metricsd/include/metrics/c_metrics_library.h

diff --git a/metrics/include/metrics/metrics_library.h b/metricsd/include/metrics/metrics_library.h
similarity index 100%
rename from metrics/include/metrics/metrics_library.h
rename to metricsd/include/metrics/metrics_library.h

diff --git a/metrics/init/metrics_daemon.conf b/metricsd/init/metrics_daemon.conf
similarity index 100%
rename from metrics/init/metrics_daemon.conf
rename to metricsd/init/metrics_daemon.conf

diff --git a/metrics/init/metrics_library.conf b/metricsd/init/metrics_library.conf
similarity index 100%
rename from metrics/init/metrics_library.conf
rename to metricsd/init/metrics_library.conf

diff --git a/metrics/libmetrics-334380.gyp b/metricsd/libmetrics-334380.gyp
similarity index 100%
rename from metrics/libmetrics-334380.gyp
rename to metricsd/libmetrics-334380.gyp

diff --git a/metrics/libmetrics.gypi b/metricsd/libmetrics.gypi
similarity index 100%
rename from metrics/libmetrics.gypi
rename to metricsd/libmetrics.gypi

diff --git a/metrics/libmetrics.pc.in b/metricsd/libmetrics.pc.in
similarity index 100%
rename from metrics/libmetrics.pc.in
rename to metricsd/libmetrics.pc.in

diff --git a/metrics/make_tests.sh b/metricsd/make_tests.sh
similarity index 100%
rename from metrics/make_tests.sh
rename to metricsd/make_tests.sh

diff --git a/metrics/metrics.gyp b/metricsd/metrics.gyp
similarity index 100%
rename from metrics/metrics.gyp
rename to metricsd/metrics.gyp

diff --git a/metrics/metrics_client.cc b/metricsd/metrics_client.cc
similarity index 100%
rename from metrics/metrics_client.cc
rename to metricsd/metrics_client.cc

diff --git a/metrics/metrics_daemon.cc b/metricsd/metrics_daemon.cc
similarity index 100%
rename from metrics/metrics_daemon.cc
rename to metricsd/metrics_daemon.cc

diff --git a/metrics/metrics_daemon.h b/metricsd/metrics_daemon.h
similarity index 100%
rename from metrics/metrics_daemon.h
rename to metricsd/metrics_daemon.h

diff --git a/metrics/metrics_daemon_main.cc b/metricsd/metrics_daemon_main.cc
similarity index 100%
rename from metrics/metrics_daemon_main.cc
rename to metricsd/metrics_daemon_main.cc

diff --git a/metrics/metrics_daemon_test.cc b/metricsd/metrics_daemon_test.cc
similarity index 100%
rename from metrics/metrics_daemon_test.cc
rename to metricsd/metrics_daemon_test.cc

diff --git a/metrics/metrics_library.cc b/metricsd/metrics_library.cc
similarity index 100%
rename from metrics/metrics_library.cc
rename to metricsd/metrics_library.cc

diff --git a/metrics/metrics_library_mock.h b/metricsd/metrics_library_mock.h
similarity index 100%
rename from metrics/metrics_library_mock.h
rename to metricsd/metrics_library_mock.h

diff --git a/metrics/metrics_library_test.cc b/metricsd/metrics_library_test.cc
similarity index 100%
rename from metrics/metrics_library_test.cc
rename to metricsd/metrics_library_test.cc

diff --git a/metrics/persistent_integer.cc b/metricsd/persistent_integer.cc
similarity index 100%
rename from metrics/persistent_integer.cc
rename to metricsd/persistent_integer.cc

diff --git a/metrics/persistent_integer.h b/metricsd/persistent_integer.h
similarity index 100%
rename from metrics/persistent_integer.h
rename to metricsd/persistent_integer.h

diff --git a/metrics/persistent_integer_mock.h b/metricsd/persistent_integer_mock.h
similarity index 100%
rename from metrics/persistent_integer_mock.h
rename to metricsd/persistent_integer_mock.h

diff --git a/metrics/persistent_integer_test.cc b/metricsd/persistent_integer_test.cc
similarity index 100%
rename from metrics/persistent_integer_test.cc
rename to metricsd/persistent_integer_test.cc

diff --git a/metrics/platform2_preinstall.sh b/metricsd/platform2_preinstall.sh
similarity index 100%
rename from metrics/platform2_preinstall.sh
rename to metricsd/platform2_preinstall.sh

diff --git a/metrics/serialization/metric_sample.cc b/metricsd/serialization/metric_sample.cc
similarity index 100%
rename from metrics/serialization/metric_sample.cc
rename to metricsd/serialization/metric_sample.cc

diff --git a/metrics/serialization/metric_sample.h b/metricsd/serialization/metric_sample.h
similarity index 100%
rename from metrics/serialization/metric_sample.h
rename to metricsd/serialization/metric_sample.h

diff --git a/metrics/serialization/serialization_utils.cc b/metricsd/serialization/serialization_utils.cc
similarity index 100%
rename from metrics/serialization/serialization_utils.cc
rename to metricsd/serialization/serialization_utils.cc

diff --git a/metrics/serialization/serialization_utils.h b/metricsd/serialization/serialization_utils.h
similarity index 100%
rename from metrics/serialization/serialization_utils.h
rename to metricsd/serialization/serialization_utils.h

diff --git a/metrics/serialization/serialization_utils_unittest.cc b/metricsd/serialization/serialization_utils_unittest.cc
similarity index 100%
rename from metrics/serialization/serialization_utils_unittest.cc
rename to metricsd/serialization/serialization_utils_unittest.cc

diff --git a/metrics/syslog_parser.sh b/metricsd/syslog_parser.sh
similarity index 100%
rename from metrics/syslog_parser.sh
rename to metricsd/syslog_parser.sh

diff --git a/metrics/timer.cc b/metricsd/timer.cc
similarity index 100%
rename from metrics/timer.cc
rename to metricsd/timer.cc

diff --git a/metrics/timer.h b/metricsd/timer.h
similarity index 100%
rename from metrics/timer.h
rename to metricsd/timer.h

diff --git a/metrics/timer_mock.h b/metricsd/timer_mock.h
similarity index 100%
rename from metrics/timer_mock.h
rename to metricsd/timer_mock.h

diff --git a/metrics/timer_test.cc b/metricsd/timer_test.cc
similarity index 100%
rename from metrics/timer_test.cc
rename to metricsd/timer_test.cc

diff --git a/metrics/uploader/metrics_hashes.cc b/metricsd/uploader/metrics_hashes.cc
similarity index 100%
rename from metrics/uploader/metrics_hashes.cc
rename to metricsd/uploader/metrics_hashes.cc

diff --git a/metrics/uploader/metrics_hashes.h b/metricsd/uploader/metrics_hashes.h
similarity index 100%
rename from metrics/uploader/metrics_hashes.h
rename to metricsd/uploader/metrics_hashes.h

diff --git a/metrics/uploader/metrics_hashes_unittest.cc b/metricsd/uploader/metrics_hashes_unittest.cc
similarity index 100%
rename from metrics/uploader/metrics_hashes_unittest.cc
rename to metricsd/uploader/metrics_hashes_unittest.cc

diff --git a/metrics/uploader/metrics_log.cc b/metricsd/uploader/metrics_log.cc
similarity index 100%
rename from metrics/uploader/metrics_log.cc
rename to metricsd/uploader/metrics_log.cc

diff --git a/metrics/uploader/metrics_log.h b/metricsd/uploader/metrics_log.h
similarity index 100%
rename from metrics/uploader/metrics_log.h
rename to metricsd/uploader/metrics_log.h

diff --git a/metrics/uploader/metrics_log_base.cc b/metricsd/uploader/metrics_log_base.cc
similarity index 100%
rename from metrics/uploader/metrics_log_base.cc
rename to metricsd/uploader/metrics_log_base.cc

diff --git a/metrics/uploader/metrics_log_base.h b/metricsd/uploader/metrics_log_base.h
similarity index 100%
rename from metrics/uploader/metrics_log_base.h
rename to metricsd/uploader/metrics_log_base.h

diff --git a/metrics/uploader/metrics_log_base_unittest.cc b/metricsd/uploader/metrics_log_base_unittest.cc
similarity index 100%
rename from metrics/uploader/metrics_log_base_unittest.cc
rename to metricsd/uploader/metrics_log_base_unittest.cc

diff --git a/metrics/uploader/mock/mock_system_profile_setter.h b/metricsd/uploader/mock/mock_system_profile_setter.h
similarity index 100%
rename from metrics/uploader/mock/mock_system_profile_setter.h
rename to metricsd/uploader/mock/mock_system_profile_setter.h

diff --git a/metrics/uploader/mock/sender_mock.cc b/metricsd/uploader/mock/sender_mock.cc
similarity index 100%
rename from metrics/uploader/mock/sender_mock.cc
rename to metricsd/uploader/mock/sender_mock.cc

diff --git a/metrics/uploader/mock/sender_mock.h b/metricsd/uploader/mock/sender_mock.h
similarity index 100%
rename from metrics/uploader/mock/sender_mock.h
rename to metricsd/uploader/mock/sender_mock.h

diff --git a/metrics/uploader/proto/README b/metricsd/uploader/proto/README
similarity index 100%
rename from metrics/uploader/proto/README
rename to metricsd/uploader/proto/README

diff --git a/metrics/uploader/proto/chrome_user_metrics_extension.proto b/metricsd/uploader/proto/chrome_user_metrics_extension.proto
similarity index 91%
rename from metrics/uploader/proto/chrome_user_metrics_extension.proto
rename to metricsd/uploader/proto/chrome_user_metrics_extension.proto
index 2c91f9f..d4d4f24 100644
--- a/metrics/uploader/proto/chrome_user_metrics_extension.proto
+++ b/metricsd/uploader/proto/chrome_user_metrics_extension.proto

@@ -14,9 +14,9 @@
 
 package metrics;
 
-import "system/core/metrics/uploader/proto/histogram_event.proto";
-import "system/core/metrics/uploader/proto/system_profile.proto";
-import "system/core/metrics/uploader/proto/user_action_event.proto";
+import "system/core/metricsd/uploader/proto/histogram_event.proto";
+import "system/core/metricsd/uploader/proto/system_profile.proto";
+import "system/core/metricsd/uploader/proto/user_action_event.proto";
 
 // Next tag: 13
 message ChromeUserMetricsExtension {

diff --git a/metrics/uploader/proto/histogram_event.proto b/metricsd/uploader/proto/histogram_event.proto
similarity index 100%
rename from metrics/uploader/proto/histogram_event.proto
rename to metricsd/uploader/proto/histogram_event.proto

diff --git a/metrics/uploader/proto/system_profile.proto b/metricsd/uploader/proto/system_profile.proto
similarity index 100%
rename from metrics/uploader/proto/system_profile.proto
rename to metricsd/uploader/proto/system_profile.proto

diff --git a/metrics/uploader/proto/user_action_event.proto b/metricsd/uploader/proto/user_action_event.proto
similarity index 100%
rename from metrics/uploader/proto/user_action_event.proto
rename to metricsd/uploader/proto/user_action_event.proto

diff --git a/metrics/uploader/sender.h b/metricsd/uploader/sender.h
similarity index 100%
rename from metrics/uploader/sender.h
rename to metricsd/uploader/sender.h

diff --git a/metrics/uploader/sender_http.cc b/metricsd/uploader/sender_http.cc
similarity index 100%
rename from metrics/uploader/sender_http.cc
rename to metricsd/uploader/sender_http.cc

diff --git a/metrics/uploader/sender_http.h b/metricsd/uploader/sender_http.h
similarity index 100%
rename from metrics/uploader/sender_http.h
rename to metricsd/uploader/sender_http.h

diff --git a/metrics/uploader/system_profile_cache.cc b/metricsd/uploader/system_profile_cache.cc
similarity index 100%
rename from metrics/uploader/system_profile_cache.cc
rename to metricsd/uploader/system_profile_cache.cc

diff --git a/metrics/uploader/system_profile_cache.h b/metricsd/uploader/system_profile_cache.h
similarity index 100%
rename from metrics/uploader/system_profile_cache.h
rename to metricsd/uploader/system_profile_cache.h

diff --git a/metrics/uploader/system_profile_setter.h b/metricsd/uploader/system_profile_setter.h
similarity index 100%
rename from metrics/uploader/system_profile_setter.h
rename to metricsd/uploader/system_profile_setter.h

diff --git a/metrics/uploader/upload_service.cc b/metricsd/uploader/upload_service.cc
similarity index 100%
rename from metrics/uploader/upload_service.cc
rename to metricsd/uploader/upload_service.cc

diff --git a/metrics/uploader/upload_service.h b/metricsd/uploader/upload_service.h
similarity index 100%
rename from metrics/uploader/upload_service.h
rename to metricsd/uploader/upload_service.h

diff --git a/metrics/uploader/upload_service_test.cc b/metricsd/uploader/upload_service_test.cc
similarity index 100%
rename from metrics/uploader/upload_service_test.cc
rename to metricsd/uploader/upload_service_test.cc