diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-04-21 02:25:50 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-04-21 02:25:50 +0000 |
| commit | ac8a0291accc414ba38ac6f1b6f05ae61b4f641b (patch) | |
| tree | 52f2e641c2312374c338e45310f474f7a5ab7aaa | |
| parent | 183fcac6a05f4720f11179757f9f458aeb699ba6 (diff) | |
| parent | bab2b5417ff3cefce03bff3435aa88fbeacd7d3b (diff) | |
| download | core-ac8a0291accc414ba38ac6f1b6f05ae61b4f641b.tar.gz | |
Merge "Merge "Merge "Merge "resolve merge conflicts of 21ef3ae3fd1dd2076c3b97efa09b3d58e799ce9f to android11-tests-dev" into android11-tests-dev am: bdf02cc54d" into android12-tests-dev am: fdca6ffb38" into android12L-tests-dev am: c1a6b27d21" am: c3c2643a8b am: 5639819569 am: bab2b5417f
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1726290
Change-Id: If709246da0db705ed8e89f3939efe55af4270a71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | fs_mgr/liblp/builder_test.cpp | 2 | ||||
| -rw-r--r-- | fs_mgr/liblp/io_test.cpp | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/fs_mgr/liblp/builder_test.cpp b/fs_mgr/liblp/builder_test.cpp index 72827eb6c..1759cf900 100644 --- a/fs_mgr/liblp/builder_test.cpp +++ b/fs_mgr/liblp/builder_test.cpp @@ -14,6 +14,7 @@ * limitations under the License. */ +#include <android-base/properties.h> #include <gmock/gmock.h> #include <gtest/gtest.h> #include <liblp/builder.h> @@ -31,6 +32,7 @@ using ::testing::AnyNumber; using ::testing::ElementsAre; using ::testing::NiceMock; using ::testing::Return; +using android::base::GetProperty; class Environment : public ::testing::Environment { public: diff --git a/fs_mgr/liblp/io_test.cpp b/fs_mgr/liblp/io_test.cpp index e67fb33b6..d1233047c 100644 --- a/fs_mgr/liblp/io_test.cpp +++ b/fs_mgr/liblp/io_test.cpp @@ -20,7 +20,10 @@ #include <sys/syscall.h> #include <android-base/file.h> +#include <android-base/properties.h> #include <android-base/unique_fd.h> +#include <fs_mgr.h> +#include <fstab/fstab.h> #include <gmock/gmock.h> #include <gtest/gtest.h> #include <liblp/builder.h> @@ -38,6 +41,7 @@ using namespace android::fs_mgr::testing; using ::testing::_; using ::testing::Return; using unique_fd = android::base::unique_fd; +using android::base::GetProperty; // Our tests assume a 128KiB disk with two 512 byte metadata slots. static const size_t kDiskSize = 131072; |