snapuserd: Split out the implementation into a libsnapuserd component. (c59682f9) · Commits · e / os / android_system_core

fs_mgr/libsnapshot/snapuserd/Android.bp

+27 −19

Original line number	Original line	Diff line number	Diff line
	@@ -25,8 +25,6 @@ cc_defaults {
	],		],
	cflags: [		cflags: [
	"-D_FILE_OFFSET_BITS=64",		"-D_FILE_OFFSET_BITS=64",
	"-Wall",
	"-Werror",
	],		],
	export_include_dirs: ["include"],		export_include_dirs: ["include"],
	srcs: [		srcs: [
	@@ -54,30 +52,48 @@ cc_library_static {
	vendor_ramdisk_available: true,		vendor_ramdisk_available: true,
	}		}

	cc_defaults {		cc_library_static {
	name: "snapuserd_defaults",		name: "libsnapuserd",
	defaults: [		defaults: [
	"fs_mgr_defaults",		"fs_mgr_defaults",
	],		],
	srcs: [		srcs: [
	"dm-snapshot-merge/snapuserd_server.cpp",
	"dm-snapshot-merge/snapuserd.cpp",		"dm-snapshot-merge/snapuserd.cpp",
	"dm-snapshot-merge/snapuserd_worker.cpp",		"dm-snapshot-merge/snapuserd_worker.cpp",
	"dm-snapshot-merge/snapuserd_readahead.cpp",		"dm-snapshot-merge/snapuserd_readahead.cpp",
	"snapuserd_daemon.cpp",
	"snapuserd_buffer.cpp",		"snapuserd_buffer.cpp",
	"user-space-merge/snapuserd_core.cpp",		"user-space-merge/snapuserd_core.cpp",
	"user-space-merge/snapuserd_dm_user.cpp",		"user-space-merge/snapuserd_dm_user.cpp",
	"user-space-merge/snapuserd_merge.cpp",		"user-space-merge/snapuserd_merge.cpp",
	"user-space-merge/snapuserd_readahead.cpp",		"user-space-merge/snapuserd_readahead.cpp",
	"user-space-merge/snapuserd_transitions.cpp",		"user-space-merge/snapuserd_transitions.cpp",
	"user-space-merge/snapuserd_server.cpp",
	"user-space-merge/snapuserd_verify.cpp",		"user-space-merge/snapuserd_verify.cpp",
	],		],
			static_libs: [
			"libbase",
			"libdm",
			"libext4_utils",
			"libsnapshot_cow",
			"liburing",
			],
			include_dirs: ["bionic/libc/kernel"],
			header_libs: [
			"libstorage_literals_headers",
			],
			ramdisk_available: true,
			vendor_ramdisk_available: true,
			recovery_available: true,
			}

	cflags: [		cc_defaults {
	"-Wall",		name: "snapuserd_defaults",
	"-Werror",		defaults: [
			"fs_mgr_defaults",
			],
			srcs: [
			"dm-snapshot-merge/snapuserd_server.cpp",
			"snapuserd_daemon.cpp",
			"user-space-merge/snapuserd_server.cpp",
	],		],

	static_libs: [		static_libs: [
	@@ -90,6 +106,7 @@ cc_defaults {
	"liblog",		"liblog",
	"libsnapshot_cow",		"libsnapshot_cow",
	"libsnapshot_snapuserd",		"libsnapshot_snapuserd",
			"libsnapuserd",
	"libz",		"libz",
	"liblz4",		"liblz4",
	"libext4_utils",		"libext4_utils",
	@@ -125,7 +142,6 @@ cc_binary {
	],		],
	ramdisk_available: false,		ramdisk_available: false,
	vendor_ramdisk_available: true,		vendor_ramdisk_available: true,
	recovery_available: true,
	}		}

	// This target will install to /system/bin/snapuserd_ramdisk		// This target will install to /system/bin/snapuserd_ramdisk
	@@ -158,10 +174,6 @@ cc_test {
	"dm-snapshot-merge/snapuserd_worker.cpp",		"dm-snapshot-merge/snapuserd_worker.cpp",
	"snapuserd_buffer.cpp",		"snapuserd_buffer.cpp",
	],		],
	cflags: [
	"-Wall",
	"-Werror",
	],
	shared_libs: [		shared_libs: [
	"libbase",		"libbase",
	"liblog",		"liblog",
	@@ -197,10 +209,6 @@ cc_test {
	srcs: [		srcs: [
	"user-space-merge/snapuserd_test.cpp",		"user-space-merge/snapuserd_test.cpp",
	],		],
	cflags: [
	"-Wall",
	"-Werror",
	],
	shared_libs: [		shared_libs: [
	"libbase",		"libbase",
	"liblog",		"liblog",