StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Pass jars with resources to R8""

Browse Source
This commit is contained in:
Colin Cross
2021-08-05 15:25:25 +00:00
committed by Gerrit Code Review
parent ac33aac0aa 1d73c7316c
commit 93fb53f5d0
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/base.go
View File

@@ -1230,7 +1230,7 @@ func (j *Module) compile(ctx android.ModuleContext, aaptSrcJar android.Path) {
} }
// Dex compilation // Dex compilation
var dexOutputFile android.OutputPath var dexOutputFile android.OutputPath
dexOutputFile = j.dexer.compileDex(ctx, flags, j.MinSdkVersion(ctx), implementationAndResourcesJar, jarName) dexOutputFile = j.dexer.compileDex(ctx, flags, j.MinSdkVersion(ctx), outputFile, jarName)
if ctx.Failed() { if ctx.Failed() {
return return
} }

8
java/dex.go
View File

@@ -92,13 +92,11 @@ func init() {
var d8, d8RE = pctx.MultiCommandRemoteStaticRules("d8", var d8, d8RE = pctx.MultiCommandRemoteStaticRules("d8",
blueprint.RuleParams{ blueprint.RuleParams{
Command: `rm -rf "$outDir" && mkdir -p "$outDir" && ` + Command: `rm -rf "$outDir" && mkdir -p "$outDir" && ` +
`${config.Zip2ZipCmd} -i $in -o $outDir/in.jar -x '**/*.dex' &&` + `$d8Template${config.D8Cmd} ${config.DexFlags} --output $outDir $d8Flags $in && ` +
`$d8Template${config.D8Cmd} ${config.DexFlags} --output $outDir $d8Flags $outDir/in.jar && ` +
`$zipTemplate${config.SoongZipCmd} $zipFlags -o $outDir/classes.dex.jar -C $outDir -f "$outDir/classes*.dex" && ` + `$zipTemplate${config.SoongZipCmd} $zipFlags -o $outDir/classes.dex.jar -C $outDir -f "$outDir/classes*.dex" && ` +
`${config.MergeZipsCmd} -D -stripFile "**/*.class" $out $outDir/classes.dex.jar $in`, `${config.MergeZipsCmd} -D -stripFile "**/*.class" $out $outDir/classes.dex.jar $in`,
CommandDeps: []string{ CommandDeps: []string{
"${config.D8Cmd}", "${config.D8Cmd}",
"${config.Zip2ZipCmd}",
"${config.SoongZipCmd}", "${config.SoongZipCmd}",
"${config.MergeZipsCmd}", "${config.MergeZipsCmd}",
}, },
@@ -124,11 +122,10 @@ var r8, r8RE = pctx.MultiCommandRemoteStaticRules("r8",
Command: `rm -rf "$outDir" && mkdir -p "$outDir" && ` + Command: `rm -rf "$outDir" && mkdir -p "$outDir" && ` +
`rm -f "$outDict" && rm -rf "${outUsageDir}" && ` + `rm -f "$outDict" && rm -rf "${outUsageDir}" && ` +
`mkdir -p $$(dirname ${outUsage}) && ` + `mkdir -p $$(dirname ${outUsage}) && ` +
`${config.Zip2ZipCmd} -i $in -o $outDir/in.jar -x '**/*.dex' &&` +
// TODO(b/181095653): remove R8 timeout and go back to config.R8Cmd. // TODO(b/181095653): remove R8 timeout and go back to config.R8Cmd.
`${runWithTimeoutCmd} -timeout 30m -on_timeout '${jstackCmd} $$PID' -- ` + `${runWithTimeoutCmd} -timeout 30m -on_timeout '${jstackCmd} $$PID' -- ` +
`$r8Template${config.JavaCmd} ${config.DexJavaFlags} -cp ${config.R8Jar} ` + `$r8Template${config.JavaCmd} ${config.DexJavaFlags} -cp ${config.R8Jar} ` +
`com.android.tools.r8.compatproguard.CompatProguard -injars $outDir/in.jar --output $outDir ` + `com.android.tools.r8.compatproguard.CompatProguard -injars $in --output $outDir ` +
`--no-data-resources ` + `--no-data-resources ` +
`-printmapping ${outDict} ` + `-printmapping ${outDict} ` +
`-printusage ${outUsage} ` + `-printusage ${outUsage} ` +
@@ -140,7 +137,6 @@ var r8, r8RE = pctx.MultiCommandRemoteStaticRules("r8",
`${config.MergeZipsCmd} -D -stripFile "**/*.class" $out $outDir/classes.dex.jar $in`, `${config.MergeZipsCmd} -D -stripFile "**/*.class" $out $outDir/classes.dex.jar $in`,
CommandDeps: []string{ CommandDeps: []string{
"${config.R8Jar}", "${config.R8Jar}",
"${config.Zip2ZipCmd}",
"${config.SoongZipCmd}", "${config.SoongZipCmd}",
"${config.MergeZipsCmd}", "${config.MergeZipsCmd}",
"${runWithTimeoutCmd}", "${runWithTimeoutCmd}",