Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dfcd654a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "resolve merge conflicts of 21ef3ae3 to... 

Merge "resolve merge conflicts of 21ef3ae3 to android11-tests-dev" into android11-tests-dev am: bdf02cc5

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1726290

Change-Id: If1f75842c028f8511bfa0d50b76bc3fef29a2f2b
parents 53542c37 bdf02cc5

fs_mgr/liblp/builder_test.cpp

+2 −0
Original line number Diff line number Diff line
@@ -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:

fs_mgr/liblp/io_test.cpp

+4 −0
Original line number Diff line number Diff line
@@ -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;