Merge "crash_dump: fix warnings, turn on -Werror." (c5933ed9) · Commits · e / os / android_system_core

debuggerd/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -3,7 +3,7 @@ cc_defaults {
		cflags: [
		"-Wall",
		"-Wextra",
		"-Wno-error",
		"-Werror",
		"-Wno-nullability-completeness",
		"-Os",
		],

+4 −4

Original line number	Diff line number	Diff line
		@@ -199,10 +199,6 @@ int main(int argc, char** argv) {
		pid_t main_tid;
		pid_t pseudothread_tid;

		if (target == 1) {
		LOG(FATAL) << "target died before we could attach (received main tid = " << main_tid << ")";
		}

		if (!android::base::ParseInt(argv[1], &main_tid, 1, std::numeric_limits<pid_t>::max())) {
		LOG(FATAL) << "invalid main tid: " << argv[1];
		}
		@@ -211,6 +207,10 @@ int main(int argc, char** argv) {
		LOG(FATAL) << "invalid pseudothread tid: " << argv[2];
		}

		if (target == 1) {
		LOG(FATAL) << "target died before we could attach (received main tid = " << main_tid << ")";
		}

		android::procinfo::ProcessInfo target_info;
		if (!android::procinfo::GetProcessInfo(main_tid, &target_info)) {
		LOG(FATAL) << "failed to fetch process info for target " << main_tid;

+1 −0

Original line number	Diff line number	Diff line
		@@ -43,6 +43,7 @@ void engrave_tombstone_ucontext(int tombstone_fd, uintptr_t abort_msg_address, s
		ucontext_t* ucontext);

		// Compatibility shim.
		__attribute__((__unused__))
		static void engrave_tombstone_ucontext(int tombstone_fd, pid_t, pid_t, uintptr_t abort_msg_address,
		siginfo_t* siginfo, ucontext_t* ucontext) {
		engrave_tombstone_ucontext(tombstone_fd, abort_msg_address, siginfo, ucontext);