Merge "Track rename from base/ to android-base/."

am: 5d8fdbb6ff

* commit '5d8fdbb6ff3d617e48198e12a2b1c10b48d22f79':
  Track rename from base/ to android-base/.

49 files changed, 69 insertions, 69 deletions

diff --git a/iotop/iotop.cpp b/iotop/iotop.cpp
index a7d569bd..828fb32c 100644
--- a/iotop/iotop.cpp
+++ b/iotop/iotop.cpp
@@ -22,7 +22,7 @@
 #include <unordered_map>
 #include <vector>
 
-#include <base/logging.h>
+#include <android-base/logging.h>
 
 #include "tasklist.h"
 #include "taskstats.h"
diff --git a/iotop/tasklist.cpp b/iotop/tasklist.cpp
index c1041a46..f81143fb 100644
--- a/iotop/tasklist.cpp
+++ b/iotop/tasklist.cpp
@@ -23,7 +23,7 @@
 #include <string>
 #include <vector>
 
-#include <base/stringprintf.h>
+#include <android-base/stringprintf.h>
 
 #include "tasklist.h"
 
diff --git a/iotop/taskstats.cpp b/iotop/taskstats.cpp
index 34e91e03..60c933d1 100644
--- a/iotop/taskstats.cpp
+++ b/iotop/taskstats.cpp
@@ -20,7 +20,7 @@
 #include <algorithm>
 #include <memory>
 
-#include <base/logging.h>
+#include <android-base/logging.h>
 
 #include "taskstats.h"
 
diff --git a/libfec/fec_verity.cpp b/libfec/fec_verity.cpp
index 8de25efc..ca4572c6 100644
--- a/libfec/fec_verity.cpp
+++ b/libfec/fec_verity.cpp
@@ -16,7 +16,7 @@
 
 #include <ctype.h>
 #include <stdlib.h>
-#include <base/strings.h>
+#include <android-base/strings.h>
 #include "fec_private.h"
 
 /* converts a hex nibble into an int */
diff --git a/memory_replay/tests/LineBufferTest.cpp b/memory_replay/tests/LineBufferTest.cpp
index 56bdb918..29d1b53b 100644
--- a/memory_replay/tests/LineBufferTest.cpp
+++ b/memory_replay/tests/LineBufferTest.cpp
@@ -18,7 +18,7 @@
 
 #include <string>
 
-#include <base/test_utils.h>
+#include <android-base/test_utils.h>
 
 #include "LineBuffer.h"
 
diff --git a/memory_replay/tests/NativeInfoTest.cpp b/memory_replay/tests/NativeInfoTest.cpp
index e527e46d..59dbbd98 100644
--- a/memory_replay/tests/NativeInfoTest.cpp
+++ b/memory_replay/tests/NativeInfoTest.cpp
@@ -19,7 +19,7 @@
 
 #include <string>
 
-#include <base/test_utils.h>
+#include <android-base/test_utils.h>
 
 #include "NativeInfo.h"
 
diff --git a/perfprofd/configreader.cc b/perfprofd/configreader.cc
index 9c8d5ac3..e9dbdec9 100644
--- a/perfprofd/configreader.cc
+++ b/perfprofd/configreader.cc
@@ -19,7 +19,7 @@
 #include <stdlib.h>
 #include <sstream>
 
-#include <base/file.h>
+#include <android-base/file.h>
 
 #include "configreader.h"
 #include "perfprofdutils.h"
diff --git a/perfprofd/perfprofdcore.cc b/perfprofd/perfprofdcore.cc
index d9ed2b03..134c05c2 100644
--- a/perfprofd/perfprofdcore.cc
+++ b/perfprofd/perfprofdcore.cc
@@ -34,8 +34,8 @@
 #include <set>
 #include <cctype>
 
-#include <base/file.h>
-#include <base/stringprintf.h>
+#include <android-base/file.h>
+#include <android-base/stringprintf.h>
 #include <cutils/properties.h>
 
 #include "perfprofdcore.h"
diff --git a/perfprofd/tests/perfprofd_test.cc b/perfprofd/tests/perfprofd_test.cc
index 666d987b..3a32204b 100644
--- a/perfprofd/tests/perfprofd_test.cc
+++ b/perfprofd/tests/perfprofd_test.cc
@@ -24,7 +24,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
-#include <base/stringprintf.h>
+#include <android-base/stringprintf.h>
 
 #include "perfprofdcore.h"
 #include "configreader.h"
diff --git a/simpleperf/build_id.h b/simpleperf/build_id.h
index 5d587f27..05c37d59 100644
--- a/simpleperf/build_id.h
+++ b/simpleperf/build_id.h
@@ -19,7 +19,7 @@
 
 #include <string.h>
 #include <algorithm>
-#include <base/stringprintf.h>
+#include <android-base/stringprintf.h>
 
 constexpr size_t BUILD_ID_SIZE = 20;
 
diff --git a/simpleperf/callchain.cpp b/simpleperf/callchain.cpp
index 30932162..8fdafc43 100644
--- a/simpleperf/callchain.cpp
+++ b/simpleperf/callchain.cpp
@@ -20,7 +20,7 @@
 
 #include <queue>
 
-#include <base/logging.h>
+#include <android-base/logging.h>
 #include "sample_tree.h"
 
 static bool MatchSampleByName(const SampleEntry* sample1, const SampleEntry* sample2) {
diff --git a/simpleperf/cmd_dumprecord.cpp b/simpleperf/cmd_dumprecord.cpp
index 5e31aa42..438f1e4f 100644
--- a/simpleperf/cmd_dumprecord.cpp
+++ b/simpleperf/cmd_dumprecord.cpp
@@ -20,9 +20,9 @@
 #include <string>
 #include <vector>
 
-#include <base/logging.h>
-#include <base/stringprintf.h>
-#include <base/strings.h>
+#include <android-base/logging.h>
+#include <android-base/stringprintf.h>
+#include <android-base/strings.h>
 
 #include "command.h"
 #include "event_attr.h"
diff --git a/simpleperf/cmd_help.cpp b/simpleperf/cmd_help.cpp
index 72a42365..a29ef727 100644
--- a/simpleperf/cmd_help.cpp
+++ b/simpleperf/cmd_help.cpp
@@ -18,7 +18,7 @@
 #include <string>
 #include <vector>
 
-#include <base/logging.h>
+#include <android-base/logging.h>
 
 #include "command.h"
 
diff --git a/simpleperf/cmd_list.cpp b/simpleperf/cmd_list.cpp
index e65756a4..01ac048c 100644
--- a/simpleperf/cmd_list.cpp
+++ b/simpleperf/cmd_list.cpp
@@ -19,7 +19,7 @@
 #include <string>
 #include <vector>
 
-#include <base/logging.h>
+#include <android-base/logging.h>
 
 #include "command.h"
 #include "event_attr.h"
diff --git a/simpleperf/cmd_record.cpp b/simpleperf/cmd_record.cpp
index 8cfbfdff..5ca04144 100644
--- a/simpleperf/cmd_record.cpp
+++ b/simpleperf/cmd_record.cpp
@@ -24,8 +24,8 @@
 #include <unordered_map>
 #include <vector>
 
-#include <base/logging.h>
-#include <base/strings.h>
+#include <android-base/logging.h>
+#include <android-base/strings.h>
 
 #include "command.h"
 #include "dwarf_unwind.h"
diff --git a/simpleperf/cmd_record_test.cpp b/simpleperf/cmd_record_test.cpp
index 72c871b9..0a9dfde2 100644
--- a/simpleperf/cmd_record_test.cpp
+++ b/simpleperf/cmd_record_test.cpp
@@ -16,7 +16,7 @@
 
 #include <gtest/gtest.h>
 
-#include <base/stringprintf.h>
+#include <android-base/stringprintf.h>
 
 #include "command.h"
 #include "environment.h"
diff --git a/simpleperf/cmd_report.cpp b/simpleperf/cmd_report.cpp
index 9fe751f0..8254c2ac 100644
--- a/simpleperf/cmd_report.cpp
+++ b/simpleperf/cmd_report.cpp
@@ -24,9 +24,9 @@
 #include <unordered_set>
 #include <vector>
 
-#include <base/logging.h>
-#include <base/stringprintf.h>
-#include <base/strings.h>
+#include <android-base/logging.h>
+#include <android-base/stringprintf.h>
+#include <android-base/strings.h>
 
 #include "command.h"
 #include "dwarf_unwind.h"
diff --git a/simpleperf/cmd_stat.cpp b/simpleperf/cmd_stat.cpp
index 5e82ba8e..fbc0caa8 100644
--- a/simpleperf/cmd_stat.cpp
+++ b/simpleperf/cmd_stat.cpp
@@ -25,8 +25,8 @@
 #include <string>
 #include <vector>
 
-#include <base/logging.h>
-#include <base/strings.h>
+#include <android-base/logging.h>
+#include <android-base/strings.h>
 
 #include "command.h"
 #include "environment.h"
diff --git a/simpleperf/cmd_stat_test.cpp b/simpleperf/cmd_stat_test.cpp
index 8de50fc0..34448066 100644
--- a/simpleperf/cmd_stat_test.cpp
+++ b/simpleperf/cmd_stat_test.cpp
@@ -16,7 +16,7 @@
 
 #include <gtest/gtest.h>
 
-#include <base/stringprintf.h>
+#include <android-base/stringprintf.h>
 
 #include "command.h"
 #include "test_util.h"
diff --git a/simpleperf/command.cpp b/simpleperf/command.cpp
index 8889d7f4..d4cfd659 100644
--- a/simpleperf/command.cpp
+++ b/simpleperf/command.cpp
@@ -21,7 +21,7 @@
 #include <string>
 #include <vector>
 
-#include <base/logging.h>
+#include <android-base/logging.h>
 
 bool Command::NextArgumentOrError(const std::vector<std::string>& args, size_t* pi) {
   if (*pi + 1 == args.size()) {
diff --git a/simpleperf/command.h b/simpleperf/command.h
index e2c84536..e8fef45a 100644
--- a/simpleperf/command.h
+++ b/simpleperf/command.h
@@ -22,7 +22,7 @@
 #include <string>
 #include <vector>
 
-#include <base/macros.h>
+#include <android-base/macros.h>
 
 class Command {
  public:
diff --git a/simpleperf/cpu_offline_test.cpp b/simpleperf/cpu_offline_test.cpp
index 2a66c214..311767df 100644
--- a/simpleperf/cpu_offline_test.cpp
+++ b/simpleperf/cpu_offline_test.cpp
@@ -28,9 +28,9 @@
 #include <thread>
 #include <unordered_map>
 
-#include <base/file.h>
-#include <base/logging.h>
-#include <base/stringprintf.h>
+#include <android-base/file.h>
+#include <android-base/logging.h>
+#include <android-base/stringprintf.h>
 
 #include "command.h"
 #include "event_attr.h"
diff --git a/simpleperf/darwin_support/darwin_support.cpp b/simpleperf/darwin_support/darwin_support.cpp
index cdfcdb14..a2489956 100644
--- a/simpleperf/darwin_support/darwin_support.cpp
+++ b/simpleperf/darwin_support/darwin_support.cpp
@@ -15,7 +15,7 @@
  */
 
 // Add fake functions to build successfully on darwin.
-#include <base/logging.h>
+#include <android-base/logging.h>
 
 #include "dwarf_unwind.h"
 #include "environment.h"
diff --git a/simpleperf/dso.cpp b/simpleperf/dso.cpp
index 6f895259..6397eaa3 100644
--- a/simpleperf/dso.cpp
+++ b/simpleperf/dso.cpp
@@ -23,7 +23,7 @@
 #include <limits>
 #include <vector>
 
-#include <base/logging.h>
+#include <android-base/logging.h>
 
 #include "environment.h"
 #include "read_elf.h"
diff --git a/simpleperf/dwarf_unwind.cpp b/simpleperf/dwarf_unwind.cpp
index 1d0f7ae0..fd84febe 100644
--- a/simpleperf/dwarf_unwind.cpp
+++ b/simpleperf/dwarf_unwind.cpp
@@ -19,7 +19,7 @@
 #include <ucontext.h>
 
 #include <backtrace/Backtrace.h>
-#include <base/logging.h>
+#include <android-base/logging.h>
 
 #include "thread_tree.h"
 
diff --git a/simpleperf/environment.cpp b/simpleperf/environment.cpp
index 560fa89b..4da624b1 100644
--- a/simpleperf/environment.cpp
+++ b/simpleperf/environment.cpp
@@ -25,10 +25,10 @@
 #include <unordered_map>
 #include <vector>
 
-#include <base/file.h>
-#include <base/logging.h>
-#include <base/strings.h>
-#include <base/stringprintf.h>
+#include <android-base/file.h>
+#include <android-base/logging.h>
+#include <android-base/strings.h>
+#include <android-base/stringprintf.h>
 
 #include "read_elf.h"
 #include "utils.h"
diff --git a/simpleperf/environment_test.cpp b/simpleperf/environment_test.cpp
index 1257cd5d..9a965304 100644
--- a/simpleperf/environment_test.cpp
+++ b/simpleperf/environment_test.cpp
@@ -17,7 +17,7 @@
 #include <gtest/gtest.h>
 
 #include <functional>
-#include <base/file.h>
+#include <android-base/file.h>
 
 #include "environment.h"
 
diff --git a/simpleperf/event_attr.cpp b/simpleperf/event_attr.cpp
index d0b66139..6ac74941 100644
--- a/simpleperf/event_attr.cpp
+++ b/simpleperf/event_attr.cpp
@@ -21,7 +21,7 @@
 #include <string>
 #include <unordered_map>
 
-#include <base/logging.h>
+#include <android-base/logging.h>
 
 #include "event_type.h"
 #include "utils.h"
diff --git a/simpleperf/event_fd.cpp b/simpleperf/event_fd.cpp
index 6f9da385..205fa965 100644
--- a/simpleperf/event_fd.cpp
+++ b/simpleperf/event_fd.cpp
@@ -26,9 +26,9 @@
 #include <atomic>
 #include <memory>
 
-#include <base/file.h>
-#include <base/logging.h>
-#include <base/stringprintf.h>
+#include <android-base/file.h>
+#include <android-base/logging.h>
+#include <android-base/stringprintf.h>
 
 #include "event_type.h"
 #include "perf_event.h"
diff --git a/simpleperf/event_fd.h b/simpleperf/event_fd.h
index 4e123fbe..c54af97e 100644
--- a/simpleperf/event_fd.h
+++ b/simpleperf/event_fd.h
@@ -24,7 +24,7 @@
 #include <string>
 #include <vector>
 
-#include <base/macros.h>
+#include <android-base/macros.h>
 
 #include "perf_event.h"
 
diff --git a/simpleperf/event_selection_set.cpp b/simpleperf/event_selection_set.cpp
index 1a9de630..02a16778 100644
--- a/simpleperf/event_selection_set.cpp
+++ b/simpleperf/event_selection_set.cpp
@@ -16,8 +16,8 @@
 
 #include "event_selection_set.h"
 
-#include <base/logging.h>
-#include <base/stringprintf.h>
+#include <android-base/logging.h>
+#include <android-base/stringprintf.h>
 
 #include "environment.h"
 #include "event_attr.h"
diff --git a/simpleperf/event_selection_set.h b/simpleperf/event_selection_set.h
index fed3c0bc..705bc35f 100644
--- a/simpleperf/event_selection_set.h
+++ b/simpleperf/event_selection_set.h
@@ -22,7 +22,7 @@
 #include <map>
 #include <vector>
 
-#include <base/macros.h>
+#include <android-base/macros.h>
 
 #include "event_fd.h"
 #include "event_type.h"
diff --git a/simpleperf/event_type.cpp b/simpleperf/event_type.cpp
index 4f139792..ddec6f9f 100644
--- a/simpleperf/event_type.cpp
+++ b/simpleperf/event_type.cpp
@@ -21,8 +21,8 @@
 #include <string>
 #include <vector>
 
-#include <base/file.h>
-#include <base/logging.h>
+#include <android-base/file.h>
+#include <android-base/logging.h>
 
 #include "event_attr.h"
 #include "event_fd.h"
diff --git a/simpleperf/gtest_main.cpp b/simpleperf/gtest_main.cpp
index 33ec32fd..5de802af 100644
--- a/simpleperf/gtest_main.cpp
+++ b/simpleperf/gtest_main.cpp
@@ -16,7 +16,7 @@
 
 #include <gtest/gtest.h>
 
-#include <base/logging.h>
+#include <android-base/logging.h>
 
 int main(int argc, char** argv) {
   InitLogging(argv, android::base::StderrLogger);
diff --git a/simpleperf/main.cpp b/simpleperf/main.cpp
index 6b204ecf..7fdae423 100644
--- a/simpleperf/main.cpp
+++ b/simpleperf/main.cpp
@@ -19,7 +19,7 @@
 #include <string>
 #include <vector>
 
-#include <base/logging.h>
+#include <android-base/logging.h>
 
 #include "command.h"
 
diff --git a/simpleperf/perf_regs.cpp b/simpleperf/perf_regs.cpp
index 7efa01b4..5450131d 100644
--- a/simpleperf/perf_regs.cpp
+++ b/simpleperf/perf_regs.cpp
@@ -17,9 +17,9 @@
 #include "perf_regs.h"
 
 #include <unordered_map>
-#include <base/logging.h>
-#include <base/stringprintf.h>
-#include <base/strings.h>
+#include <android-base/logging.h>
+#include <android-base/stringprintf.h>
+#include <android-base/strings.h>
 
 static ArchType current_arch = GetBuildArch();
 
diff --git a/simpleperf/read_elf.cpp b/simpleperf/read_elf.cpp
index 5ec289be..9a4f4b95 100644
--- a/simpleperf/read_elf.cpp
+++ b/simpleperf/read_elf.cpp
@@ -22,8 +22,8 @@
 #include <algorithm>
 #include <limits>
 
-#include <base/file.h>
-#include <base/logging.h>
+#include <android-base/file.h>
+#include <android-base/logging.h>
 
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wunused-parameter"
diff --git a/simpleperf/record.cpp b/simpleperf/record.cpp
index bd20c37e..c8735e5b 100644
--- a/simpleperf/record.cpp
+++ b/simpleperf/record.cpp
@@ -20,8 +20,8 @@
 #include <algorithm>
 #include <unordered_map>
 
-#include <base/logging.h>
-#include <base/stringprintf.h>
+#include <android-base/logging.h>
+#include <android-base/stringprintf.h>
 
 #include "environment.h"
 #include "perf_regs.h"
diff --git a/simpleperf/record_file.h b/simpleperf/record_file.h
index 2a2bc337..c0f53b16 100644
--- a/simpleperf/record_file.h
+++ b/simpleperf/record_file.h
@@ -25,7 +25,7 @@
 #include <string>
 #include <vector>
 
-#include <base/macros.h>
+#include <android-base/macros.h>
 
 #include "perf_event.h"
 #include "record.h"
diff --git a/simpleperf/record_file_reader.cpp b/simpleperf/record_file_reader.cpp
index 99037d1a..0ee5c216 100644
--- a/simpleperf/record_file_reader.cpp
+++ b/simpleperf/record_file_reader.cpp
@@ -23,7 +23,7 @@
 #include <set>
 #include <vector>
 
-#include <base/logging.h>
+#include <android-base/logging.h>
 
 #include "perf_event.h"
 #include "record.h"
diff --git a/simpleperf/record_file_writer.cpp b/simpleperf/record_file_writer.cpp
index 4ce73267..ca1845a9 100644
--- a/simpleperf/record_file_writer.cpp
+++ b/simpleperf/record_file_writer.cpp
@@ -23,7 +23,7 @@
 #include <set>
 #include <vector>
 
-#include <base/logging.h>
+#include <android-base/logging.h>
 
 #include "perf_event.h"
 #include "record.h"
diff --git a/simpleperf/sample_tree.cpp b/simpleperf/sample_tree.cpp
index a55fd64e..a34107b1 100644
--- a/simpleperf/sample_tree.cpp
+++ b/simpleperf/sample_tree.cpp
@@ -16,7 +16,7 @@
 
 #include "sample_tree.h"
 
-#include <base/logging.h>
+#include <android-base/logging.h>
 
 #include "environment.h"
 
diff --git a/simpleperf/thread_tree.cpp b/simpleperf/thread_tree.cpp
index 8f75fb4e..31348749 100644
--- a/simpleperf/thread_tree.cpp
+++ b/simpleperf/thread_tree.cpp
@@ -18,7 +18,7 @@
 
 #include <limits>
 
-#include <base/logging.h>
+#include <android-base/logging.h>
 
 #include "environment.h"
 #include "perf_event.h"
diff --git a/simpleperf/utils.cpp b/simpleperf/utils.cpp
index ee95b091..1c95c4ea 100644
--- a/simpleperf/utils.cpp
+++ b/simpleperf/utils.cpp
@@ -26,7 +26,7 @@
 #include <algorithm>
 #include <string>
 
-#include <base/logging.h>
+#include <android-base/logging.h>
 
 void OneTimeFreeAllocator::Clear() {
   for (auto& p : v_) {
diff --git a/simpleperf/workload.cpp b/simpleperf/workload.cpp
index 56870a7e..35617fd3 100644
--- a/simpleperf/workload.cpp
+++ b/simpleperf/workload.cpp
@@ -21,7 +21,7 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
-#include <base/logging.h>
+#include <android-base/logging.h>
 
 std::unique_ptr<Workload> Workload::CreateWorkload(const std::vector<std::string>& args) {
   std::unique_ptr<Workload> workload(new Workload(args));
diff --git a/simpleperf/workload.h b/simpleperf/workload.h
index 4bb0ee5b..60b9ee8d 100644
--- a/simpleperf/workload.h
+++ b/simpleperf/workload.h
@@ -22,7 +22,7 @@
 #include <string>
 #include <vector>
 
-#include <base/macros.h>
+#include <android-base/macros.h>
 
 class Workload {
  private:
diff --git a/verity/build_verity_tree.cpp b/verity/build_verity_tree.cpp
index 5a6a6ee1..c50e4494 100644
--- a/verity/build_verity_tree.cpp
+++ b/verity/build_verity_tree.cpp
@@ -16,7 +16,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <base/file.h>
+#include <android-base/file.h>
 
 struct sparse_hash_ctx {
     unsigned char *hashes;
diff --git a/verity/fec/image.cpp b/verity/fec/image.cpp
index 41018158..95bc88ee 100644
--- a/verity/fec/image.cpp
+++ b/verity/fec/image.cpp
@@ -22,7 +22,7 @@ extern "C" {
 }
 
 #include <assert.h>
-#include <base/file.h>
+#include <android-base/file.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <getopt.h>
diff --git a/verity/fec/main.cpp b/verity/fec/main.cpp
index 07b3666a..ee844f55 100644
--- a/verity/fec/main.cpp
+++ b/verity/fec/main.cpp
@@ -28,7 +28,7 @@ extern "C" {
 #include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
-#include <base/file.h>
+#include <android-base/file.h>
 #include <fec/io.h>
 #include <fec/ecc.h>
 #include "image.h"