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

Commit 536c6454 authored Aug 30, 2024 by Akilesh Kailash Committed by Automerger Merge Worker Aug 30, 2024

Merge "libsnapshot: static link libselinux" into main am: 00493695 am: 76a1e0ec

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

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

parents a0f06f9d 76a1e0ec

fs_mgr/libsnapshot/Android.bp

+11 −1

Original line number	Original line	Diff line number	Diff line
	@@ -46,7 +46,6 @@ cc_defaults {
	"libfstab",		"libfstab",
	"libsnapuserd_client",		"libsnapuserd_client",
	"libz",		"libz",
	"libselinux",
	],		],
	header_libs: [		header_libs: [
	"libfiemap_headers",		"libfiemap_headers",
	@@ -112,6 +111,9 @@ cc_library_static {
	static_libs: [		static_libs: [
	"libfs_mgr_binder",		"libfs_mgr_binder",
	],		],
			whole_static_libs: [
			"libselinux",
			],
	}		}

	cc_library {		cc_library {
	@@ -130,6 +132,9 @@ cc_library {
	static_libs: [		static_libs: [
	"libsnapshot_cow",		"libsnapshot_cow",
	],		],
			whole_static_libs: [
			"libselinux",
			],
	}		}

	cc_library_static {		cc_library_static {
	@@ -144,6 +149,7 @@ cc_library_static {
	],		],
	static_libs: [		static_libs: [
	"libfs_mgr",		"libfs_mgr",
			"libselinux",
	],		],
	}		}

	@@ -161,6 +167,9 @@ cc_library_static {
	static_libs: [		static_libs: [
	"libfs_mgr",		"libfs_mgr",
	],		],
			whole_static_libs: [
			"libselinux",
			],
	}		}

	cc_defaults {		cc_defaults {
	@@ -243,6 +252,7 @@ cc_library_static {
	"libfs_mgr",		"libfs_mgr",
	"libgmock",		"libgmock",
	"libgtest",		"libgtest",
			"libselinux",
	],		],
	}		}