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

Commit db97b80c authored Aug 01, 2023 by David Anderson Committed by Automerger Merge Worker Aug 01, 2023

Merge "libsnapshot: Introduce a dynamically linked version of libsnapshot."...

Merge "libsnapshot: Introduce a dynamically linked version of libsnapshot." into main am: c99cd866 am: 633e1f51 am: 5adf18b6 am: d551f664 am: b6bb8a44

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

Change-Id: I48e1debbd2d0a27f8d47f99759666c675eb30a40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 6c84b05a b6bb8a44

fs_mgr/libfiemap/fiemap_writer_test.cpp

+3 −1

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@
		#include <sys/vfs.h>
		#include <unistd.h>

		#include <cstring>
		#include <string>
		#include <utility>

		@@ -518,7 +519,8 @@ class FsTest : public ::testing::Test {
		ASSERT_EQ(ret, 0);

		// mount the file system
		ASSERT_EQ(mount(loop_dev.device().c_str(), mntpoint_.c_str(), "f2fs", 0, nullptr), 0);
		ASSERT_EQ(mount(loop_dev.device().c_str(), mntpoint_.c_str(), "f2fs", 0, nullptr), 0)
		<< strerror(errno);
		}

		void TearDown() override {

fs_mgr/libsnapshot/Android.bp

+22 −4

Original line number	Diff line number	Diff line
		@@ -101,7 +101,7 @@ cc_library_headers {
		}

		cc_library_static {
		name: "libsnapshot",
		name: "libsnapshot_static",
		defaults: [
		"libsnapshot_defaults",
		"libsnapshot_hal_deps",
		@@ -112,6 +112,25 @@ cc_library_static {
		],
		}

		cc_library {
		name: "libsnapshot",
		defaults: [
		"libsnapshot_defaults",
		"libsnapshot_cow_defaults",
		"libsnapshot_hal_deps",
		],
		srcs: [":libsnapshot_sources"],
		shared_libs: [
		"libfs_mgr_binder",
		"liblp",
		"libprotobuf-cpp-lite",
		],
		static_libs: [
		"libc++fs",
		"libsnapshot_cow",
		]
		}

		cc_library_static {
		name: "libsnapshot_init",
		native_coverage : true,
		@@ -247,7 +266,7 @@ cc_defaults {
		"libgsi",
		"libgmock",
		"liblp",
		"libsnapshot",
		"libsnapshot_static",
		"libsnapshot_cow",
		"libsnapshot_test_helpers",
		"libsparse",
		@@ -330,8 +349,6 @@ cc_binary {
		"libbrotli",
		"libc++fs",
		"libfstab",
		"libsnapshot",
		"libsnapshot_cow",
		"libz",
		"update_metadata-protos",
		],
		@@ -344,6 +361,7 @@ cc_binary {
		"liblog",
		"liblp",
		"libprotobuf-cpp-lite",
		"libsnapshot",
		"libstatslog",
		"libutils",
		],