diff options
| author | 2019-06-05 09:53:22 +0000 | |
|---|---|---|
| committer | 2019-06-05 09:53:22 +0000 | |
| commit | 7c9689f7b78fed7c358bcd11608946c2029b4ac1 (patch) | |
| tree | 54c3e29f84fe439edba8791fbb3e2245fa088134 /java/config/makevars.go | |
| parent | 4cb61bed13a4219ad7cde909145f1abd6e9b2856 (diff) | |
| parent | e88eaa7db7e507e718ab0ee449c4aaa95e1bfebd (diff) | |
Merge "Revert "Revert "Revert "Print full diagnostics file when Java process crashes.""""
Diffstat (limited to 'java/config/makevars.go')
| -rw-r--r-- | java/config/makevars.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/java/config/makevars.go b/java/config/makevars.go index ead298acd..9c7851174 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}") |