diff options
| author | 2019-06-05 09:53:22 +0000 | |
|---|---|---|
| committer | 2019-06-05 09:53:22 +0000 | |
| commit | 7c9689f7b78fed7c358bcd11608946c2029b4ac1 (patch) | |
| tree | 54c3e29f84fe439edba8791fbb3e2245fa088134 /java/builder.go | |
| parent | 4cb61bed13a4219ad7cde909145f1abd6e9b2856 (diff) | |
| parent | e88eaa7db7e507e718ab0ee449c4aaa95e1bfebd (diff) | |
Merge "Revert "Revert "Revert "Print full diagnostics file when Java process crashes.""""
Diffstat (limited to 'java/builder.go')
| -rw-r--r-- | java/builder.go | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/java/builder.go b/java/builder.go index e1a912b2f..d257d1da1 100644 --- a/java/builder.go +++ b/java/builder.go @@ -43,8 +43,7 @@ var ( Command: `rm -rf "$outDir" "$annoDir" "$srcJarDir" && mkdir -p "$outDir" "$annoDir" "$srcJarDir" && ` + `${config.ZipSyncCmd} -d $srcJarDir -l $srcJarDir/list -f "*.java" $srcJars && ` + `(if [ -s $srcJarDir/list ] || [ -s $out.rsp ] ; then ` + - `${config.SoongJavacWrapper} ${config.JavacWrapper}${config.JavacCmd} ` + - `${config.JavacHeapFlags} ${config.JavacVmFlags} ${config.CommonJdkFlags} ` + + `${config.SoongJavacWrapper} ${config.JavacWrapper}${config.JavacCmd} ${config.JavacHeapFlags} ${config.CommonJdkFlags} ` + `$processorpath $processor $javacFlags $bootClasspath $classpath ` + `-source $javaVersion -target $javaVersion ` + `-d $outDir -s $annoDir @$out.rsp @$srcJarDir/list ; fi ) && ` + @@ -65,7 +64,7 @@ var ( turbine = pctx.AndroidStaticRule("turbine", blueprint.RuleParams{ Command: `rm -rf "$outDir" && mkdir -p "$outDir" && ` + - `${config.JavaCmd} ${config.JavaVmFlags} -jar ${config.TurbineJar} --output $out.tmp ` + + `${config.JavaCmd} -jar ${config.TurbineJar} --output $out.tmp ` + `--temp_dir "$outDir" --sources @$out.rsp --source_jars $srcJars ` + `--javacopts ${config.CommonJdkFlags} ` + `$javacFlags -source $javaVersion -target $javaVersion -- $bootClasspath $classpath && ` + @@ -109,7 +108,7 @@ var ( jarjar = pctx.AndroidStaticRule("jarjar", blueprint.RuleParams{ - Command: "${config.JavaCmd} ${config.JavaVmFlags} -jar ${config.JarjarCmd} process $rulesFile $in $out", + Command: "${config.JavaCmd} -jar ${config.JarjarCmd} process $rulesFile $in $out", CommandDeps: []string{"${config.JavaCmd}", "${config.JarjarCmd}", "$rulesFile"}, }, "rulesFile") @@ -125,7 +124,7 @@ var ( jetifier = pctx.AndroidStaticRule("jetifier", blueprint.RuleParams{ - Command: "${config.JavaCmd} ${config.JavaVmFlags} -jar ${config.JetifierJar} -l error -o $out -i $in", + Command: "${config.JavaCmd} -jar ${config.JetifierJar} -l error -o $out -i $in", CommandDeps: []string{"${config.JavaCmd}", "${config.JetifierJar}"}, }, ) |