ScoopDroid/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "resolve merge conflicts of 21ef3ae3fd to android11-tests-dev" into android11-tests-dev

Browse source
This commit is contained in:
Treehugger Robot 2021-06-08 21:30:04 +00:00 • committed by Gerrit Code Review
commit bdf02cc54d
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fs_mgr/liblp/builder_test.cpp
View file

@ -14,6 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#include <android-base/properties.h>
#include <gmock/gmock.h> #include <gmock/gmock.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include <liblp/builder.h> #include <liblp/builder.h>
@ -31,6 +32,7 @@ using ::testing::AnyNumber;
using ::testing::ElementsAre; using ::testing::ElementsAre;
using ::testing::NiceMock; using ::testing::NiceMock;
using ::testing::Return; using ::testing::Return;
using android::base::GetProperty;
class Environment : public ::testing::Environment { class Environment : public ::testing::Environment {
public: public:

4
fs_mgr/liblp/io_test.cpp
View file

@ -20,7 +20,10 @@
#include <sys/syscall.h> #include <sys/syscall.h>
#include <android-base/file.h> #include <android-base/file.h>
#include <android-base/properties.h>
#include <android-base/unique_fd.h> #include <android-base/unique_fd.h>
#include <fs_mgr.h>
#include <fstab/fstab.h>
#include <gmock/gmock.h> #include <gmock/gmock.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include <liblp/builder.h> #include <liblp/builder.h>
@ -38,6 +41,7 @@ using namespace android::fs_mgr::testing;
using ::testing::_; using ::testing::_;
using ::testing::Return; using ::testing::Return;
using unique_fd = android::base::unique_fd; using unique_fd = android::base::unique_fd;
using android::base::GetProperty;
// Our tests assume a 128KiB disk with two 512 byte metadata slots. // Our tests assume a 128KiB disk with two 512 byte metadata slots.
static const size_t kDiskSize = 131072; static const size_t kDiskSize = 131072;