Merge "Add static_assert to check sizeof off_t" into main (53a71f6b) · Commits · e / os / android_system_core

fs_mgr/libsnapshot/snapuserd/Android.bp

+12 −0

Original line number	Diff line number	Diff line
		@@ -74,6 +74,11 @@ cc_library_static {
		"user-space-merge/worker.cpp",
		"utility.cpp",
		],
		cflags: [
		"-D_FILE_OFFSET_BITS=64",
		"-Wall",
		"-Werror",
		],
		static_libs: [
		"libbase",
		"libdm",
		@@ -106,6 +111,8 @@ cc_defaults {

		cflags: [
		"-D_FILE_OFFSET_BITS=64",
		"-Wall",
		"-Werror",
		],

		static_libs: [
		@@ -230,6 +237,11 @@ cc_defaults {
		"testing/host_harness.cpp",
		"user-space-merge/snapuserd_test.cpp",
		],
		cflags: [
		"-D_FILE_OFFSET_BITS=64",
		"-Wall",
		"-Werror",
		],
		shared_libs: [
		"libbase",
		"liblog",

+1 −0

Original line number	Diff line number	Diff line
		@@ -249,6 +249,7 @@ class SnapshotHandler : public std::enable_shared_from_this<SnapshotHandler> {
		};

		std::ostream& operator<<(std::ostream& os, MERGE_IO_TRANSITION value);
		static_assert(sizeof(off_t) == sizeof(uint64_t));

		} // namespace snapshot
		} // namespace android