Merge "Revert "Print full diagnostics file when Java process crashes.""
diff --git a/core/combo/javac.mk b/core/combo/javac.mk
index a4cb6c5..dac2628 100644
--- a/core/combo/javac.mk
+++ b/core/combo/javac.mk
@@ -16,5 +16,4 @@
 
 # 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 -XX:OnError="cat hs_err_pid%p.log"
-
+JAVA := $(ANDROID_JAVA_TOOLCHAIN)/java