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

Commit d61da594 authored Jun 05, 2024 by Elliott Hughes Committed by Automerger Merge Worker Jun 05, 2024

Merge "libc++fs is part of libc++ now." into main am: 5b09799b am: fb066360

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

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

parents 0e221798 fb066360

fastboot/Android.bp

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -190,7 +190,6 @@ cc_binary {

	static_libs: [		static_libs: [
	"android.hardware.health-translate-ndk",		"android.hardware.health-translate-ndk",
	"libc++fs",
	"libhealthhalutils",		"libhealthhalutils",
	"libhealthshim",		"libhealthshim",
	"libfastbootshim",		"libfastbootshim",
	@@ -416,7 +415,6 @@ cc_test_host {
	srcs: ["vendor_boot_img_utils_test.cpp"],		srcs: ["vendor_boot_img_utils_test.cpp"],
	static_libs: [		static_libs: [
	"libbase",		"libbase",
	"libc++fs",
	"libfastboot",		"libfastboot",
	"libgmock",		"libgmock",
	"liblog",		"liblog",

fs_mgr/libsnapshot/Android.bp

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -126,7 +126,6 @@ cc_library {
	"libprotobuf-cpp-lite",		"libprotobuf-cpp-lite",
	],		],
	static_libs: [		static_libs: [
	"libc++fs",
	"libsnapshot_cow",		"libsnapshot_cow",
	],		],
	}		}
	@@ -269,7 +268,6 @@ cc_defaults {
	"android.hardware.boot@1.1",		"android.hardware.boot@1.1",
	"android.hardware.boot-V1-ndk",		"android.hardware.boot-V1-ndk",
	"libbrotli",		"libbrotli",
	"libc++fs",
	"libfs_mgr_binder",		"libfs_mgr_binder",
	"libgflags",		"libgflags",
	"libgsi",		"libgsi",
	@@ -350,7 +348,6 @@ cc_binary {
	],		],
	static_libs: [		static_libs: [
	"libbrotli",		"libbrotli",
	"libc++fs",
	"libfstab",		"libfstab",
	"libz",		"libz",
	"update_metadata-protos",		"update_metadata-protos",

init/Android.bp

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -168,7 +168,6 @@ libinit_cc_defaults {
	"libavb",		"libavb",
	"libavf_cc_flags",		"libavf_cc_flags",
	"libbootloader_message",		"libbootloader_message",
	"libc++fs",
	"libcgrouprc_format",		"libcgrouprc_format",
	"liblmkd_utils",		"liblmkd_utils",
	"liblz4",		"liblz4",
	@@ -371,7 +370,6 @@ init_first_stage_cc_defaults {
	],		],

	static_libs: [		static_libs: [
	"libc++fs",
	"libfs_avb",		"libfs_avb",
	"libavf_cc_flags",		"libavf_cc_flags",
	"libfs_mgr",		"libfs_mgr",

init/fuzzer/Android.bp

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -20,7 +20,6 @@ package {
	cc_defaults {		cc_defaults {
	name: "libinit_fuzzer_defaults",		name: "libinit_fuzzer_defaults",
	static_libs: [		static_libs: [
	"libc++fs",
	"liblmkd_utils",		"liblmkd_utils",
	"libmodprobe",		"libmodprobe",
	"libprotobuf-cpp-lite",		"libprotobuf-cpp-lite",