diff options
| author | Colin Cross <ccross@android.com> | 2018-03-15 16:24:10 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2018-03-20 11:21:42 -0700 |
| commit | 0a7d85a89609053e604035c27552dcf8cd483f5d (patch) | |
| tree | 9611d86534fdbfa5d6152a7be19434ac28b438c8 /java/builder.go | |
| parent | f2986f067bdac13049a2f0449d77ab1f63b0ef90 (diff) | |
| download | build_soong-0a7d85a89609053e604035c27552dcf8cd483f5d.tar.gz build_soong-0a7d85a89609053e604035c27552dcf8cd483f5d.tar.bz2 build_soong-0a7d85a89609053e604035c27552dcf8cd483f5d.zip | |
Replace extract-srcjars.sh with zipsync tool
extract_srcjars.sh uses zipinfo and unzip, which fail with an
error on an empty zip file. Instead of trying to hack around
this (which is hard to make guarantees for since they are
non-hermetic host tools), replace them with a go tool to unzip
a set of zip files into a directory.
Bug: 73885582
Test: m checkbuild
Change-Id: I151fed347ed5196726e36866ffc27bc831799afb
Merged-In: I151fed347ed5196726e36866ffc27bc831799afb
(cherry picked from commit 436b76564d83586c68025985bc5d9fc7774109bf)
Diffstat (limited to 'java/builder.go')
| -rw-r--r-- | java/builder.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/java/builder.go b/java/builder.go index 6d894a33..bc955995 100644 --- a/java/builder.go +++ b/java/builder.go @@ -41,7 +41,7 @@ var ( javac = pctx.AndroidGomaStaticRule("javac", blueprint.RuleParams{ Command: `rm -rf "$outDir" "$annoDir" "$srcJarDir" && mkdir -p "$outDir" "$annoDir" "$srcJarDir" && ` + - `${config.ExtractSrcJarsCmd} $srcJarDir $srcJarDir/list $srcJars && ` + + `${config.ZipSyncCmd} -d $srcJarDir -l $srcJarDir/list -f "*.java" $srcJars && ` + `${config.SoongJavacWrapper} ${config.JavacWrapper}${config.JavacCmd} ${config.JavacHeapFlags} ${config.CommonJdkFlags} ` + `$javacFlags $bootClasspath $classpath ` + `-source $javaVersion -target $javaVersion ` + @@ -50,7 +50,7 @@ var ( CommandDeps: []string{ "${config.JavacCmd}", "${config.SoongZipCmd}", - "${config.ExtractSrcJarsCmd}", + "${config.ZipSyncCmd}", }, CommandOrderOnly: []string{"${config.SoongJavacWrapper}"}, Rspfile: "$out.rsp", @@ -62,7 +62,7 @@ var ( kotlinc = pctx.AndroidGomaStaticRule("kotlinc", blueprint.RuleParams{ Command: `rm -rf "$outDir" "$srcJarDir" && mkdir -p "$outDir" "$srcJarDir" && ` + - `${config.ExtractSrcJarsCmd} $srcJarDir $srcJarDir/list $srcJars && ` + + `${config.ZipSyncCmd} -d $srcJarDir -l $srcJarDir/list -f "*.java" $srcJars && ` + `${config.GenKotlinBuildFileCmd} $classpath $outDir $out.rsp $srcJarDir/list > $outDir/kotlinc-build.xml &&` + `${config.KotlincCmd} $kotlincFlags ` + `-jvm-target $kotlinJvmTarget -Xbuild-file=$outDir/kotlinc-build.xml && ` + @@ -72,7 +72,7 @@ var ( "${config.KotlinCompilerJar}", "${config.GenKotlinBuildFileCmd}", "${config.SoongZipCmd}", - "${config.ExtractSrcJarsCmd}", + "${config.ZipSyncCmd}", }, Rspfile: "$out.rsp", RspfileContent: `$in`, @@ -82,7 +82,7 @@ var ( errorprone = pctx.AndroidStaticRule("errorprone", blueprint.RuleParams{ Command: `rm -rf "$outDir" "$annoDir" "$srcJarDir" && mkdir -p "$outDir" "$annoDir" "$srcJarDir" && ` + - `${config.ExtractSrcJarsCmd} $srcJarDir $srcJarDir/list $srcJars && ` + + `${config.ZipSyncCmd} -d $srcJarDir -l $srcJarDir/list -f "*.java" $srcJars && ` + `${config.SoongJavacWrapper} ${config.ErrorProneCmd} ` + `$javacFlags $bootClasspath $classpath ` + `-source $javaVersion -target $javaVersion ` + @@ -93,7 +93,7 @@ var ( "${config.ErrorProneJavacJar}", "${config.ErrorProneJar}", "${config.SoongZipCmd}", - "${config.ExtractSrcJarsCmd}", + "${config.ZipSyncCmd}", }, CommandOrderOnly: []string{"${config.SoongJavacWrapper}"}, Rspfile: "$out.rsp", |