diff options
| author | Elliott Hughes <enh@google.com> | 2015-12-04 22:00:26 -0800 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2015-12-04 22:00:26 -0800 |
| commit | 4f71319df011d796a60a43fc1bc68e16fbf7d321 (patch) | |
| tree | 5e9b64a97edcda3dbb1d40c617bdd9b179deb259 /libziparchive | |
| parent | 1efab7acc5d5b69dced70b6d04070d36f7c9632d (diff) | |
| download | core-4f71319df011d796a60a43fc1bc68e16fbf7d321.tar.gz core-4f71319df011d796a60a43fc1bc68e16fbf7d321.tar.bz2 core-4f71319df011d796a60a43fc1bc68e16fbf7d321.zip | |
Track rename of base/ to android-base/.
Change-Id: Idf9444fece4aa89c93e15640de59a91f6e758ccf
Diffstat (limited to 'libziparchive')
| -rw-r--r-- | libziparchive/zip_archive.cc | 6 | ||||
| -rw-r--r-- | libziparchive/zip_archive_common.h | 2 | ||||
| -rw-r--r-- | libziparchive/zip_archive_test.cc | 2 | ||||
| -rw-r--r-- | libziparchive/zip_writer_test.cc | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/libziparchive/zip_archive.cc b/libziparchive/zip_archive.cc index 3d18f7c67..07ef6cd19 100644 --- a/libziparchive/zip_archive.cc +++ b/libziparchive/zip_archive.cc @@ -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" diff --git a/libziparchive/zip_archive_common.h b/libziparchive/zip_archive_common.h index 7f20d51c6..ca4250942 100644 --- a/libziparchive/zip_archive_common.h +++ b/libziparchive/zip_archive_common.h @@ -17,7 +17,7 @@ #ifndef LIBZIPARCHIVE_ZIPARCHIVECOMMON_H_ #define LIBZIPARCHIVE_ZIPARCHIVECOMMON_H_ -#include "base/macros.h" +#include "android-base/macros.h" #include <inttypes.h> diff --git a/libziparchive/zip_archive_test.cc b/libziparchive/zip_archive_test.cc index 32b1a38b1..cb0f41050 100644 --- a/libziparchive/zip_archive_test.cc +++ b/libziparchive/zip_archive_test.cc @@ -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; diff --git a/libziparchive/zip_writer_test.cc b/libziparchive/zip_writer_test.cc index f752b7e6e..b7d145833 100644 --- a/libziparchive/zip_writer_test.cc +++ b/libziparchive/zip_writer_test.cc @@ -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> |