diff options
| author | Alexander Smundak <asmundak@google.com> | 2019-05-31 03:15:55 +0000 |
|---|---|---|
| committer | Alexander Smundak <asmundak@google.com> | 2019-05-31 03:15:55 +0000 |
| commit | d71dc6b5e0b01e4835a033bb51c278a10b0c1481 (patch) | |
| tree | fea336c23bf3d1eeebc6fae8698d2507a0c12f6d /java/config | |
| parent | 9d6df2246c076142428b10c08f614b6ea615b095 (diff) | |
| download | build_soong-d71dc6b5e0b01e4835a033bb51c278a10b0c1481.tar.gz build_soong-d71dc6b5e0b01e4835a033bb51c278a10b0c1481.tar.bz2 build_soong-d71dc6b5e0b01e4835a033bb51c278a10b0c1481.zip | |
Revert "Print full diagnostics file when Java process crashes."
This reverts commit 9d6df2246c076142428b10c08f614b6ea615b095.
Reason for revert: This change set the value of JAVA make variable to a string containing "foo bar". When soong_ui is asked to evaluate such string, it drops the quotes, causing bash to treat 'foo' and 'bar' as separate command line arguments.
Change-Id: If4e3c4c950c305bb67a572de3d86119c2da81dc1
Diffstat (limited to 'java/config')
| -rw-r--r-- | java/config/config.go | 2 | ||||
| -rw-r--r-- | java/config/makevars.go | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/java/config/config.go b/java/config/config.go index 28c89958..46cd361d 100644 --- a/java/config/config.go +++ b/java/config/config.go @@ -69,8 +69,6 @@ func init() { // b/65004097: prevent using java.lang.invoke.StringConcatFactory when using -target 1.9 `-XDstringConcat=inline`, }, " ")) - pctx.StaticVariable("JavaVmFlags", "-XX:OnError=\"cat hs_err_pid%p.log\"") - pctx.StaticVariable("JavacVmFlags", "-J-XX:OnError=\"cat hs_err_pid%p.log\"") pctx.VariableConfigMethod("hostPrebuiltTag", android.Config.PrebuiltOS) diff --git a/java/config/makevars.go b/java/config/makevars.go index fc90b367..6881caff 100644 --- a/java/config/makevars.go +++ b/java/config/makevars.go @@ -39,8 +39,8 @@ func makeVarsProvider(ctx android.MakeVarsContext) { ctx.Strict("ANDROID_JAVA8_HOME", "prebuilts/jdk/jdk8/${hostPrebuiltTag}") ctx.Strict("ANDROID_JAVA9_HOME", "prebuilts/jdk/jdk9/${hostPrebuiltTag}") ctx.Strict("ANDROID_JAVA_TOOLCHAIN", "${JavaToolchain}") - ctx.Strict("JAVA", "${JavaCmd} ${JavaVmFlags}") - ctx.Strict("JAVAC", "${JavacCmd} ${JavacVmFlags}") + ctx.Strict("JAVA", "${JavaCmd}") + ctx.Strict("JAVAC", "${JavacCmd}") ctx.Strict("JAR", "${JarCmd}") ctx.Strict("JAR_ARGS", "${JarArgsCmd}") ctx.Strict("JAVADOC", "${JavadocCmd}") @@ -58,8 +58,8 @@ func makeVarsProvider(ctx android.MakeVarsContext) { ctx.Strict("ERROR_PRONE_CHECKS", "${ErrorProneChecks}") } - ctx.Strict("TARGET_JAVAC", "${JavacCmd} ${JavacVmFlags} ${CommonJdkFlags}") - ctx.Strict("HOST_JAVAC", "${JavacCmd} ${JavacVmFlags} ${CommonJdkFlags}") + ctx.Strict("TARGET_JAVAC", "${JavacCmd} ${CommonJdkFlags}") + ctx.Strict("HOST_JAVAC", "${JavacCmd} ${CommonJdkFlags}") ctx.Strict("JLINK", "${JlinkCmd}") ctx.Strict("JMOD", "${JmodCmd}") |