From 1e3ad0eb5df843f88d8e08c3766b5f620b569c93 Mon Sep 17 00:00:00 2001
From: Alexander Smundak <asmundak@google.com>
Date: Mon, 3 Jun 2019 16:55:13 +0000
Subject: [PATCH] Revert "Revert "Print full diagnostics file when Java process
 crashes.""

This reverts commit 6c77a6baa6461be855eb58814a223995eaa3dd66.

Reason for revert: aog/974065 fixes the problem that caused the revert

Change-Id: I935f78762b23ac63a79a9529515ff4ef394d5c3c
---
 core/combo/javac.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/combo/javac.mk b/core/combo/javac.mk
index dac2628572..a4cb6c51a8 100644
--- a/core/combo/javac.mk
+++ b/core/combo/javac.mk
@@ -16,4 +16,5 @@ ANDROID_JAVA_TOOLCHAIN := $(ANDROID_JAVA_HOME)/bin
 
 # TODO(ccross): remove this, it is needed for now because it is used by
 # config.mk before makevars from soong are loaded
-JAVA := $(ANDROID_JAVA_TOOLCHAIN)/java
+JAVA := $(ANDROID_JAVA_TOOLCHAIN)/java -XX:OnError="cat hs_err_pid%p.log"
+