Snap for 7460045 from 40fccd3fe548ff3b4a9dad31d51f1bc2a44061e5 to sc-v2-release (4d88c061) · Commits · e / os / android_system_core

debuggerd/handler/debuggerd_fallback.cpp

+6 −0

Original line number	Diff line number	Diff line
		@@ -87,6 +87,12 @@ static void debuggerd_fallback_trace(int output_fd, ucontext_t* ucontext) {

		// TODO: Create this once and store it in a global?
		unwindstack::UnwinderFromPid unwinder(kMaxFrames, getpid());
		// Do not use the thread cache here because it will call pthread_key_create
		// which doesn't work in linker code. See b/189803009.
		// Use a normal cached object because the process is stopped, and there
		// is no chance of data changing between reads.
		auto process_memory = unwindstack::Memory::CreateProcessMemoryCached(getpid());
		unwinder.SetProcessMemory(process_memory);
		dump_backtrace_thread(output_fd, &unwinder, thread);
		}
		__linker_disable_fallback_allocator();

+5 −0

Original line number	Diff line number	Diff line
		@@ -166,6 +166,11 @@ static Image images[] = {
		"vbmeta_system.sig",
		"vbmeta_system",
		true, ImageType::BootCritical },
		{ "vbmeta_vendor",
		"vbmeta_vendor.img",
		"vbmeta_vendor.sig",
		"vbmeta_vendor",
		true, ImageType::BootCritical },
		{ "vendor", "vendor.img", "vendor.sig", "vendor", true, ImageType::Normal },
		{ "vendor_boot",
		"vendor_boot.img", "vendor_boot.sig",

+1 −1

Original line number	Diff line number	Diff line
		@@ -24,7 +24,7 @@
		int main() {
		::android::hardware::configureRpcThreadpool(1, true);
		auto trustyKeymaster = new keymaster::TrustyKeymaster();
		int err = trustyKeymaster->Initialize();
		int err = trustyKeymaster->Initialize(keymaster::KmVersion::KEYMASTER_3);
		if (err != 0) {
		LOG(FATAL) << "Could not initialize TrustyKeymaster (" << err << ")";
		return -1;

+1 −1

Original line number	Diff line number	Diff line
		@@ -24,7 +24,7 @@
		int main() {
		::android::hardware::configureRpcThreadpool(1, true);
		auto trustyKeymaster = new keymaster::TrustyKeymaster();
		int err = trustyKeymaster->Initialize();
		int err = trustyKeymaster->Initialize(keymaster::KmVersion::KEYMASTER_4);
		if (err != 0) {
		LOG(FATAL) << "Could not initialize TrustyKeymaster (" << err << ")";
		return -1;

+43 −0

Original line number	Diff line number	Diff line
		@@ -80,6 +80,49 @@ cc_binary {
		vintf_fragments: ["4.0/android.hardware.keymaster@4.0-service.trusty.xml"],
		}

		cc_binary {
		name: "android.hardware.security.keymint-service.trusty",
		relative_install_path: "hw",
		init_rc: ["keymint/android.hardware.security.keymint-service.trusty.rc"],
		vintf_fragments: [
		"keymint/android.hardware.security.keymint-service.trusty.xml",
		],
		vendor: true,
		cflags: [
		"-Wall",
		"-Wextra",
		],
		local_include_dirs: [
		"include",
		],
		srcs: [
		"TrustyKeymaster.cpp",
		"ipc/trusty_keymaster_ipc.cpp",
		"keymint/TrustyKeyMintDevice.cpp",
		"keymint/TrustyKeyMintOperation.cpp",
		"keymint/TrustySecureClock.cpp",
		"keymint/TrustySharedSecret.cpp",
		"keymint/service.cpp",
		],
		shared_libs: [
		"android.hardware.security.keymint-V1-ndk_platform",
		"android.hardware.security.secureclock-V1-ndk_platform",
		"android.hardware.security.sharedsecret-V1-ndk_platform",
		"lib_android_keymaster_keymint_utils",
		"libbase",
		"libbinder_ndk",
		"libhardware",
		"libkeymaster_messages",
		"libkeymint",
		"liblog",
		"libtrusty",
		],
		required: [
		"RemoteProvisioner",
		"android.hardware.hardware_keystore.xml",
		],
		}

		prebuilt_etc {
		name: "keymaster_soft_attestation_keys.xml",
		vendor: true,