Snap for 8421339 from a90966a5140d44381cbdd9bc288f6162fb476ec1 to tm-qpr1-release (2100e0a3) · Commits · e / os / android_system_core

debuggerd/Android.bp

+8 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,10 @@ cc_library_headers {
		export_include_dirs: ["common/include"],
		recovery_available: true,
		vendor_ramdisk_available: true,
		apex_available: [
		"com.android.virt",
		"//apex_available:platform",
		],
		}

		cc_library_shared {
		@@ -44,6 +48,10 @@ cc_library_shared {
		"libbase",
		"libcutils",
		],
		apex_available: [
		"com.android.virt",
		"//apex_available:platform",
		],

		export_header_lib_headers: ["libdebuggerd_common_headers"],
		export_include_dirs: ["tombstoned/include"],

+1 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@ cc_library_static {
		shared_libs: [
		"libtombstoned_client",
		],
		apex_available: ["com.android.virt"],
		}

		rust_defaults {

+2 −2

Original line number	Diff line number	Diff line
		@@ -113,10 +113,10 @@ static void Copy(const char* src, const char* dst) {
		LOG(INFO) << "hard linking " << src << " to " << dst << " succeeded";
		return;
		}
		PLOG(FATAL) << "hard linking " << src << " to " << dst << " failed, falling back to copy.";
		PLOG(FATAL) << "hard linking " << src << " to " << dst << " failed";
		}

		// Move e2fsck before switching root, so that it is available at the same path
		// Move snapuserd before switching root, so that it is available at the same path
		// after switching root.
		void PrepareSwitchRoot() {
		constexpr const char* src = "/system/bin/snapuserd";