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

am: 912ed3d8ca

* commit '912ed3d8ca78d840a1d19543a205d787fbfbf235':
  Track rename of base/ to android-base/.
This commit is contained in:
Elliott Hughes 2015-12-07 23:14:17 +00:00 committed by android-build-merger
commit e2a9563be1
80 changed files with 136 additions and 138 deletions

View File

@ -33,10 +33,10 @@
#include <string>
#include <vector>
#include <base/logging.h>
#include <base/macros.h>
#include <base/stringprintf.h>
#include <base/strings.h>
#include <android-base/logging.h>
#include <android-base/macros.h>
#include <android-base/stringprintf.h>
#include <android-base/strings.h>
#include "adb_auth.h"
#include "adb_io.h"

View File

@ -22,7 +22,7 @@
#include <string>
#include <base/macros.h>
#include <android-base/macros.h>
#include "adb_trace.h"
#include "fdevent.h"

View File

@ -43,7 +43,7 @@
#include "mincrypt/rsa.h"
#undef RSA_verify
#include <base/strings.h>
#include <android-base/strings.h>
#include <cutils/list.h>
#include <openssl/evp.h>

View File

@ -31,8 +31,8 @@
#include <string>
#include <vector>
#include <base/stringprintf.h>
#include <base/strings.h>
#include <android-base/stringprintf.h>
#include <android-base/strings.h>
#include <cutils/sockets.h>
#include "adb_io.h"

View File

@ -20,7 +20,7 @@
#include <unistd.h>
#include <base/stringprintf.h>
#include <android-base/stringprintf.h>
#include "adb_trace.h"
#include "adb_utils.h"

View File

@ -27,8 +27,8 @@
#include <string>
#include "base/file.h"
#include "base/test_utils.h"
#include <android-base/file.h>
#include <android-base/test_utils.h>
// All of these tests fail on Windows because they use the C Runtime open(),
// but the adb_io APIs expect file descriptors from adb_open(). This could

View File

@ -19,7 +19,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <base/stringprintf.h>
#include <android-base/stringprintf.h>
#include <cutils/sockets.h>
#include "sysdeps.h"

View File

@ -21,8 +21,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 "adb.h"

View File

@ -17,8 +17,8 @@
#ifndef __ADB_TRACE_H
#define __ADB_TRACE_H
#include <base/logging.h>
#include <base/stringprintf.h>
#include <android-base/logging.h>
#include <android-base/stringprintf.h>
/* IMPORTANT: if you change the following list, don't
* forget to update the corresponding 'tags' table in

View File

@ -26,9 +26,9 @@
#include <algorithm>
#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 "adb_trace.h"
#include "sysdeps.h"

View File

@ -30,8 +30,8 @@
#include "sysdeps.h"
#include <base/macros.h>
#include <base/test_utils.h>
#include <android-base/macros.h>
#include <android-base/test_utils.h>
#ifdef _WIN32
static std::string subdir(const char* parent, const char* child) {

View File

@ -27,9 +27,9 @@
#include <sched.h>
#endif
#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 "adb.h"
#include "adb_auth.h"

View File

@ -35,9 +35,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>
#if !defined(_WIN32)
#include <signal.h>

View File

@ -18,9 +18,9 @@
#include <stdio.h>
#include <base/file.h>
#include <base/logging.h>
#include <base/strings.h>
#include <android-base/file.h>
#include <android-base/logging.h>
#include <android-base/strings.h>
#include <cutils/sockets.h>
#include "adb.h"

View File

@ -25,8 +25,8 @@
#include <getopt.h>
#include <sys/prctl.h>
#include "base/logging.h"
#include "base/stringprintf.h"
#include <android-base/logging.h>
#include <android-base/stringprintf.h>
#include "cutils/properties.h"
#include "private/android_filesystem_config.h"
#include "selinux/selinux.h"

View File

@ -31,8 +31,8 @@
#include <unordered_map>
#include <vector>
#include <base/logging.h>
#include <base/stringprintf.h>
#include <android-base/logging.h>
#include <android-base/stringprintf.h>
#include "adb_io.h"
#include "adb_trace.h"

View File

@ -41,9 +41,9 @@
#include "file_sync_service.h"
#include "line_printer.h"
#include <base/file.h>
#include <base/strings.h>
#include <base/stringprintf.h>
#include <android-base/file.h>
#include <android-base/strings.h>
#include <android-base/stringprintf.h>
struct syncsendbuf {
unsigned id;

View File

@ -35,8 +35,8 @@
#include "adb_utils.h"
#include "private/android_filesystem_config.h"
#include <base/stringprintf.h>
#include <base/strings.h>
#include <android-base/stringprintf.h>
#include <android-base/strings.h>
static bool should_use_fs_config(const std::string& path) {
// TODO: use fs_config to configure permissions on /data.

View File

@ -31,9 +31,9 @@
#include <unistd.h>
#endif
#include <base/file.h>
#include <base/stringprintf.h>
#include <base/strings.h>
#include <android-base/file.h>
#include <android-base/stringprintf.h>
#include <android-base/strings.h>
#include <cutils/sockets.h>
#if !ADB_HOST

View File

@ -89,8 +89,8 @@
#include <memory>
#include <base/logging.h>
#include <base/stringprintf.h>
#include <android-base/logging.h>
#include <android-base/stringprintf.h>
#include <paths.h>
#include "adb.h"

View File

@ -27,7 +27,7 @@
#include <stdint.h>
#include <base/macros.h>
#include <android-base/macros.h>
#include "adb.h"

View File

@ -23,7 +23,7 @@
#include <string>
#include <vector>
#include <base/strings.h>
#include <android-base/strings.h>
#include "adb.h"
#include "adb_io.h"

View File

@ -29,7 +29,7 @@
#include <string>
// Include this before open/unlink are defined as macros below.
#include <base/utf8.h>
#include <android-base/utf8.h>
/*
* TEMP_FAILURE_RETRY is defined by some, but not all, versions of

View File

@ -32,10 +32,10 @@
#include <cutils/sockets.h>
#include <base/logging.h>
#include <base/stringprintf.h>
#include <base/strings.h>
#include <base/utf8.h>
#include <android-base/logging.h>
#include <android-base/stringprintf.h>
#include <android-base/strings.h>
#include <android-base/utf8.h>
#include "adb.h"

View File

@ -18,7 +18,7 @@
#include "sysdeps.h"
#include "base/test_utils.h"
#include <android-base/test_utils.h>
TEST(sysdeps_win32, adb_getenv) {
// Insert all test env vars before first call to adb_getenv() which will

View File

@ -9,7 +9,7 @@
#include <sys/socket.h>
#include <unistd.h>
#include <base/file.h>
#include <android-base/file.h>
static void
panic( const char* msg )

View File

@ -29,9 +29,9 @@
#include <algorithm>
#include <list>
#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 "adb.h"
#include "adb_utils.h"

View File

@ -25,7 +25,7 @@
#include <string.h>
#include <sys/types.h>
#include <base/stringprintf.h>
#include <android-base/stringprintf.h>
#include <cutils/sockets.h>
#if !ADB_HOST

View File

@ -39,9 +39,9 @@
#include <mutex>
#include <string>
#include <base/file.h>
#include <base/stringprintf.h>
#include <base/strings.h>
#include <android-base/file.h>
#include <android-base/stringprintf.h>
#include <android-base/strings.h>
#include "adb.h"
#include "transport.h"

View File

@ -29,8 +29,8 @@
#include <inttypes.h>
#include <stdio.h>
#include <base/logging.h>
#include <base/stringprintf.h>
#include <android-base/logging.h>
#include <android-base/stringprintf.h>
#include "adb.h"
#include "transport.h"

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
#include "base/file.h"
#include "android-base/file.h"
#include <errno.h>
#include <fcntl.h>
@ -23,8 +23,8 @@
#include <string>
#include "base/macros.h" // For TEMP_FAILURE_RETRY on Darwin.
#include "base/utf8.h"
#include "android-base/macros.h" // For TEMP_FAILURE_RETRY on Darwin.
#include "android-base/utf8.h"
#define LOG_TAG "base.file"
#include "cutils/log.h"
#include "utils/Compat.h"

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
#include "base/file.h"
#include "android-base/file.h"
#include <gtest/gtest.h>
@ -24,7 +24,7 @@
#include <string>
#include "base/test_utils.h"
#include "android-base/test_utils.h"
TEST(file, ReadFileToString_ENOENT) {
std::string s("hello");

View File

@ -29,7 +29,7 @@
#include <memory>
#include <ostream>
#include "base/macros.h"
#include "android-base/macros.h"
namespace android {
namespace base {

View File

@ -19,7 +19,7 @@
#include <string>
#include <base/macros.h>
#include <android-base/macros.h>
class TemporaryFile {
public:

View File

@ -19,7 +19,7 @@
#include <unistd.h>
#include <base/macros.h>
#include <android-base/macros.h>
/* Container for a file descriptor that automatically closes the descriptor as
* it goes out of scope.

View File

@ -18,7 +18,7 @@
#include <windows.h>
#endif
#include "base/logging.h"
#include "android-base/logging.h"
#include <libgen.h>
@ -40,8 +40,8 @@
#include <mutex>
#endif
#include "base/macros.h"
#include "base/strings.h"
#include "android-base/macros.h"
#include "android-base/strings.h"
#include "cutils/threads.h"
// Headers for LogMessage::LogLine.

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
#include "base/logging.h"
#include "android-base/logging.h"
#include <libgen.h>
@ -25,9 +25,9 @@
#include <regex>
#include <string>
#include "base/file.h"
#include "base/stringprintf.h"
#include "base/test_utils.h"
#include "android-base/file.h"
#include "android-base/stringprintf.h"
#include "android-base/test_utils.h"
#include <gtest/gtest.h>

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
#include "base/parseint.h"
#include "android-base/parseint.h"
#include <gtest/gtest.h>

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
#include "base/stringprintf.h"
#include "android-base/stringprintf.h"
#include <stdio.h>

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
#include "base/stringprintf.h"
#include "android-base/stringprintf.h"
#include <gtest/gtest.h>

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
#include "base/strings.h"
#include "android-base/strings.h"
#include <stdlib.h>
#include <string.h>

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
#include "base/strings.h"
#include "android-base/strings.h"
#include <gtest/gtest.h>

View File

@ -16,7 +16,7 @@
#include <gtest/gtest.h>
#include "base/logging.h"
#include "android-base/logging.h"
int main(int argc, char** argv) {
::testing::InitGoogleTest(&argc, argv);

View File

@ -14,8 +14,8 @@
* limitations under the License.
*/
#include "base/logging.h"
#include "base/test_utils.h"
#include "android-base/logging.h"
#include "android-base/test_utils.h"
#include "utils/Compat.h" // For OS_PATH_SEPARATOR.
#include <fcntl.h>

View File

@ -16,13 +16,13 @@
#include <windows.h>
#include "base/utf8.h"
#include "android-base/utf8.h"
#include <fcntl.h>
#include <string>
#include "base/logging.h"
#include "android-base/logging.h"
namespace android {
namespace base {

View File

@ -14,11 +14,11 @@
* limitations under the License.
*/
#include "base/utf8.h"
#include "android-base/utf8.h"
#include <gtest/gtest.h>
#include "base/macros.h"
#include "android-base/macros.h"
namespace android {
namespace base {

View File

@ -24,7 +24,7 @@
#include <string>
#include <backtrace/Backtrace.h>
#include <base/stringprintf.h>
#include <android-base/stringprintf.h>
#include <log/log.h>
#include "elf_utils.h"

View File

@ -20,7 +20,7 @@
#include <string>
#include <gtest/gtest.h>
#include <base/file.h>
#include <android-base/file.h>
#include "BacktraceMock.h"
#include "log_fake.h"

View File

@ -19,7 +19,7 @@
#include <string>
#include <base/stringprintf.h>
#include <android-base/stringprintf.h>
#include <log/log.h>
#include <log/logger.h>

View File

@ -20,7 +20,7 @@
#include <string>
#include <gtest/gtest.h>
#include <base/file.h>
#include <android-base/file.h>
#include "utility.h"

View File

@ -37,7 +37,7 @@
#include <private/android_filesystem_config.h>
#include <base/stringprintf.h>
#include <android-base/stringprintf.h>
#include <cutils/properties.h>
#include <log/log.h>
#include <log/logger.h>

View File

@ -25,9 +25,9 @@
#include <sys/ptrace.h>
#include <sys/wait.h>
#include <android-base/file.h>
#include <android-base/stringprintf.h>
#include <backtrace/Backtrace.h>
#include <base/file.h>
#include <base/stringprintf.h>
#include <log/log.h>
const int SLEEP_TIME_USEC = 50000; // 0.05 seconds

View File

@ -44,13 +44,13 @@
#include <unistd.h>
#include <functional>
#include <base/parseint.h>
#include <base/strings.h>
#include <android-base/parseint.h>
#include <android-base/strings.h>
#include <sparse/sparse.h>
#include <ziparchive/zip_archive.h>
#include <base/strings.h>
#include <base/parseint.h>
#include <android-base/strings.h>
#include <android-base/parseint.h>
#include "bootimg_utils.h"
#include "fastboot.h"

View File

@ -17,7 +17,7 @@
#ifndef TRANSPORT_H_
#define TRANSPORT_H_
#include <base/macros.h>
#include <android-base/macros.h>
// General interface to allow the fastboot protocol to be used over different
// types of transports.

View File

@ -29,7 +29,7 @@
#include <libgen.h>
#include <time.h>
#include <base/file.h>
#include <android-base/file.h>
#include <private/android_filesystem_config.h>
#include <cutils/properties.h>
#include <logwrap/logwrap.h>

View File

@ -25,7 +25,7 @@ extern "C" {
#include <crypto_scrypt.h>
}
#include <base/memory.h>
#include <android-base/memory.h>
#include <UniquePtr.h>
#include <gatekeeper/gatekeeper.h>
@ -180,4 +180,3 @@ private:
}
#endif // SOFT_GATEKEEPER_H_

View File

@ -17,7 +17,7 @@
#ifndef LIBZIPARCHIVE_ZIPWRITER_H_
#define LIBZIPARCHIVE_ZIPWRITER_H_
#include "base/macros.h"
#include "android-base/macros.h"
#include <utils/Compat.h>
#include <cstdio>

View File

@ -18,8 +18,8 @@
#include <errno.h>
#include <base/strings.h>
#include <base/stringprintf.h>
#include <android-base/strings.h>
#include <android-base/stringprintf.h>
#include "builtins.h"
#include "error.h"

View File

@ -33,7 +33,7 @@
#include <string>
#include <vector>
#include <base/file.h>
#include <android-base/file.h>
#define LOG_ROOT "/data/bootchart"
#define LOG_STAT LOG_ROOT"/proc_stat.log"

View File

@ -39,7 +39,7 @@
#include <selinux/label.h>
#include <fs_mgr.h>
#include <base/stringprintf.h>
#include <android-base/stringprintf.h>
#include <cutils/partition_utils.h>
#include <cutils/android_reboot.h>
#include <logwrap/logwrap.h>

View File

@ -40,9 +40,9 @@
#include <selinux/label.h>
#include <selinux/android.h>
#include <base/file.h>
#include <base/stringprintf.h>
#include <base/strings.h>
#include <android-base/file.h>
#include <android-base/stringprintf.h>
#include <android-base/strings.h>
#include <cutils/android_reboot.h>
#include <cutils/fs.h>
#include <cutils/iosched_policy.h>

View File

@ -25,7 +25,7 @@
#include "service.h"
#include "util.h"
#include <base/stringprintf.h>
#include <android-base/stringprintf.h>
Parser::Parser() {
}

View File

@ -20,7 +20,7 @@
#include <map>
#include <string>
#include <base/stringprintf.h>
#include <android-base/stringprintf.h>
template <typename Function>
class KeywordMap {

View File

@ -22,7 +22,7 @@
#include <selinux/selinux.h>
#include <base/stringprintf.h>
#include <android-base/stringprintf.h>
static void init_klog_vwrite(int level, const char* fmt, va_list ap) {
static const char* tag = basename(getprogname());

View File

@ -47,7 +47,7 @@
#include <selinux/label.h>
#include <fs_mgr.h>
#include <base/file.h>
#include <android-base/file.h>
#include "bootimg.h"
#include "property_service.h"

View File

@ -24,8 +24,8 @@
#include <selinux/selinux.h>
#include <base/file.h>
#include <base/stringprintf.h>
#include <android-base/file.h>
#include <android-base/stringprintf.h>
#include <cutils/android_reboot.h>
#include <cutils/sockets.h>

View File

@ -23,7 +23,7 @@
#include <sys/wait.h>
#include <unistd.h>
#include <base/stringprintf.h>
#include <android-base/stringprintf.h>
#include <cutils/android_reboot.h>
#include <cutils/list.h>
#include <cutils/sockets.h>

View File

@ -22,7 +22,7 @@
#include <stdlib.h>
#include <string.h>
#include <base/stringprintf.h>
#include <android-base/stringprintf.h>
#include <private/android_filesystem_config.h>
#include <selinux/selinux.h>

View File

@ -32,12 +32,12 @@
#include <sys/socket.h>
#include <sys/un.h>
#include <base/file.h>
#include <base/strings.h>
#include <android-base/file.h>
#include <android-base/strings.h>
/* for ANDROID_SOCKET_* */
#include <cutils/sockets.h>
#include <base/stringprintf.h>
#include <android-base/stringprintf.h>
#include <private/android_filesystem_config.h>

View File

@ -22,7 +22,7 @@
#include <string>
#include <base/stringprintf.h>
#include <android-base/stringprintf.h>
#include <backtrace/Backtrace.h>
#include <backtrace/BacktraceMap.h>

View File

@ -42,7 +42,7 @@
#include <backtrace/Backtrace.h>
#include <backtrace/BacktraceMap.h>
#include <base/stringprintf.h>
#include <android-base/stringprintf.h>
#include <cutils/atomic.h>
#include <cutils/threads.h>
@ -1461,4 +1461,3 @@ TEST(libbacktrace, check_for_leak_remote) {
ASSERT_EQ(waitpid(pid, nullptr, 0), pid);
}
#endif

View File

@ -30,9 +30,9 @@
#include <memory>
#include <vector>
#include "base/file.h"
#include "base/macros.h" // TEMP_FAILURE_RETRY may or may not be in unistd
#include "base/memory.h"
#include "android-base/file.h"
#include "android-base/macros.h" // TEMP_FAILURE_RETRY may or may not be in unistd
#include "android-base/memory.h"
#include "log/log.h"
#include "utils/Compat.h"
#include "utils/FileMap.h"

View File

@ -17,7 +17,7 @@
#ifndef LIBZIPARCHIVE_ZIPARCHIVECOMMON_H_
#define LIBZIPARCHIVE_ZIPARCHIVECOMMON_H_
#include "base/macros.h"
#include "android-base/macros.h"
#include <inttypes.h>

View File

@ -23,7 +23,7 @@
#include <unistd.h>
#include <vector>
#include <base/file.h>
#include <android-base/file.h>
#include <gtest/gtest.h>
static std::string test_data_dir;

View File

@ -17,7 +17,7 @@
#include "ziparchive/zip_archive.h"
#include "ziparchive/zip_writer.h"
#include <base/test_utils.h>
#include <android-base/test_utils.h>
#include <gtest/gtest.h>
#include <memory>
#include <vector>

View File

@ -24,8 +24,8 @@
#include <memory>
#include <string>
#include <base/file.h>
#include <base/strings.h>
#include <android-base/file.h>
#include <android-base/strings.h>
#include <cutils/sched_policy.h>
#include <cutils/sockets.h>
#include <log/event_tag_map.h>

View File

@ -27,7 +27,7 @@
#include <string>
#include <base/stringprintf.h>
#include <android-base/stringprintf.h>
#include <cutils/sockets.h>
#include <private/android_filesystem_config.h>
#include <sysutils/SocketClient.h>

View File

@ -25,7 +25,7 @@
#include <string> // std::string
#include <unordered_map>
#include <base/stringprintf.h>
#include <android-base/stringprintf.h>
#include <log/log.h>
#include <private/android_filesystem_config.h>

View File

@ -16,7 +16,7 @@
#include <ctype.h>
#include <base/stringprintf.h>
#include <android-base/stringprintf.h>
#include <cutils/properties.h>
#include "LogWhiteBlackList.h"

View File

@ -27,7 +27,7 @@
#include <string>
#include <vector>
#include "base/logging.h"
#include "android-base/logging.h"
static const char* TZDATA_FILENAME = "/tzdata";
// tzdata file header (as much as we need for the version):