Skip to content

Commit

Permalink
Track rename from base/ to android-base/.
Browse files Browse the repository at this point in the history
Change-Id: Ic15d4778c7accd1382de0b440a437aba2cf67016
  • Loading branch information
enh-google committed Dec 4, 2015
1 parent dd7f62e commit 66dd09e
Show file tree
Hide file tree
Showing 49 changed files with 69 additions and 69 deletions.
2 changes: 1 addition & 1 deletion iotop/iotop.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include <unordered_map>
#include <vector>

#include <base/logging.h>
#include <android-base/logging.h>

#include "tasklist.h"
#include "taskstats.h"
Expand Down
2 changes: 1 addition & 1 deletion iotop/tasklist.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include <string>
#include <vector>

#include <base/stringprintf.h>
#include <android-base/stringprintf.h>

#include "tasklist.h"

Expand Down
2 changes: 1 addition & 1 deletion iotop/taskstats.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include <algorithm>
#include <memory>

#include <base/logging.h>
#include <android-base/logging.h>

#include "taskstats.h"

Expand Down
2 changes: 1 addition & 1 deletion libfec/fec_verity.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
2 changes: 1 addition & 1 deletion memory_replay/tests/LineBufferTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

#include <string>

#include <base/test_utils.h>
#include <android-base/test_utils.h>

#include "LineBuffer.h"

Expand Down
2 changes: 1 addition & 1 deletion memory_replay/tests/NativeInfoTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

#include <string>

#include <base/test_utils.h>
#include <android-base/test_utils.h>

#include "NativeInfo.h"

Expand Down
2 changes: 1 addition & 1 deletion perfprofd/configreader.cc
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include <stdlib.h>
#include <sstream>

#include <base/file.h>
#include <android-base/file.h>

#include "configreader.h"
#include "perfprofdutils.h"
Expand Down
4 changes: 2 additions & 2 deletions perfprofd/perfprofdcore.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion perfprofd/tests/perfprofd_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion simpleperf/build_id.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion simpleperf/callchain.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
6 changes: 3 additions & 3 deletions simpleperf/cmd_dumprecord.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion simpleperf/cmd_help.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include <string>
#include <vector>

#include <base/logging.h>
#include <android-base/logging.h>

#include "command.h"

Expand Down
2 changes: 1 addition & 1 deletion simpleperf/cmd_list.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include <string>
#include <vector>

#include <base/logging.h>
#include <android-base/logging.h>

#include "command.h"
#include "event_attr.h"
Expand Down
4 changes: 2 additions & 2 deletions simpleperf/cmd_record.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion simpleperf/cmd_record_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#include <gtest/gtest.h>

#include <base/stringprintf.h>
#include <android-base/stringprintf.h>

#include "command.h"
#include "environment.h"
Expand Down
6 changes: 3 additions & 3 deletions simpleperf/cmd_report.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions simpleperf/cmd_stat.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion simpleperf/cmd_stat_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#include <gtest/gtest.h>

#include <base/stringprintf.h>
#include <android-base/stringprintf.h>

#include "command.h"
#include "test_util.h"
Expand Down
2 changes: 1 addition & 1 deletion simpleperf/command.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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()) {
Expand Down
2 changes: 1 addition & 1 deletion simpleperf/command.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include <string>
#include <vector>

#include <base/macros.h>
#include <android-base/macros.h>

class Command {
public:
Expand Down
6 changes: 3 additions & 3 deletions simpleperf/cpu_offline_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion simpleperf/darwin_support/darwin_support.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion simpleperf/dso.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include <limits>
#include <vector>

#include <base/logging.h>
#include <android-base/logging.h>

#include "environment.h"
#include "read_elf.h"
Expand Down
2 changes: 1 addition & 1 deletion simpleperf/dwarf_unwind.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include <ucontext.h>

#include <backtrace/Backtrace.h>
#include <base/logging.h>
#include <android-base/logging.h>

#include "thread_tree.h"

Expand Down
8 changes: 4 additions & 4 deletions simpleperf/environment.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion simpleperf/environment_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include <gtest/gtest.h>

#include <functional>
#include <base/file.h>
#include <android-base/file.h>

#include "environment.h"

Expand Down
2 changes: 1 addition & 1 deletion simpleperf/event_attr.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions simpleperf/event_fd.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion simpleperf/event_fd.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include <string>
#include <vector>

#include <base/macros.h>
#include <android-base/macros.h>

#include "perf_event.h"

Expand Down
4 changes: 2 additions & 2 deletions simpleperf/event_selection_set.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion simpleperf/event_selection_set.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions simpleperf/event_type.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion simpleperf/gtest_main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion simpleperf/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include <string>
#include <vector>

#include <base/logging.h>
#include <android-base/logging.h>

#include "command.h"

Expand Down
6 changes: 3 additions & 3 deletions simpleperf/perf_regs.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down
4 changes: 2 additions & 2 deletions simpleperf/read_elf.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions simpleperf/record.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion simpleperf/record_file.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include <string>
#include <vector>

#include <base/macros.h>
#include <android-base/macros.h>

#include "perf_event.h"
#include "record.h"
Expand Down
2 changes: 1 addition & 1 deletion simpleperf/record_file_reader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include <set>
#include <vector>

#include <base/logging.h>
#include <android-base/logging.h>

#include "perf_event.h"
#include "record.h"
Expand Down
Loading

0 comments on commit 66dd09e

Please sign in to comment.