tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Merge "Merge "Merge "resolve merge conflicts of 21ef3ae3fd 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

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

Change-Id: Ib8dca74d206d437c296fc67b02578ccdca304cb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Automerger Merge Worker 2022-04-21 02:05:07 +00:00
commit bab2b5417f
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.
*/
#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:

4
fs_mgr/liblp/io_test.cpp
View file

@ -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;