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

Merge "Reland: Pass jars with resources to R8" am: 795a9f99f4

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1788754

Change-Id: Ifb51c9bdfa509713859a417b2cd8b0cad67a9e9e
This commit is contained in:
Colin Cross
2021-08-06 18:59:30 +00:00
committed by Automerger Merge Worker
parent f1338a63f7 795a9f99f4
commit bb5e173587
2 changed files with 14 additions and 5 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), outputFile, jarName) dexOutputFile = j.dexer.compileDex(ctx, flags, j.MinSdkVersion(ctx), implementationAndResourcesJar, jarName)
if ctx.Failed() { if ctx.Failed() {
return return
} }

17
java/dex.go
View File

@@ -87,11 +87,14 @@ func (d *dexer) effectiveOptimizeEnabled() bool {
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" && ` +
`$d8Template${config.D8Cmd} ${config.DexFlags} --output $outDir $d8Flags $in && ` + `mkdir -p $$(dirname $tmpJar) && ` +
`${config.Zip2ZipCmd} -i $in -o $tmpJar -x '**/*.dex' && ` +
`$d8Template${config.D8Cmd} ${config.DexFlags} --output $outDir $d8Flags $tmpJar && ` +
`$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}",
}, },
@@ -110,14 +113,16 @@ var d8, d8RE = pctx.MultiCommandRemoteStaticRules("d8",
ExecStrategy: "${config.RED8ExecStrategy}", ExecStrategy: "${config.RED8ExecStrategy}",
Platform: map[string]string{remoteexec.PoolKey: "${config.REJavaPool}"}, Platform: map[string]string{remoteexec.PoolKey: "${config.REJavaPool}"},
}, },
}, []string{"outDir", "d8Flags", "zipFlags"}, nil) }, []string{"outDir", "d8Flags", "zipFlags", "tmpJar"}, nil)
var r8, r8RE = pctx.MultiCommandRemoteStaticRules("r8", var r8, r8RE = pctx.MultiCommandRemoteStaticRules("r8",
blueprint.RuleParams{ blueprint.RuleParams{
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}) && ` +
`$r8Template${config.R8Cmd} ${config.DexFlags} -injars $in --output $outDir ` + `mkdir -p $$(dirname $tmpJar) && ` +
`${config.Zip2ZipCmd} -i $in -o $tmpJar -x '**/*.dex' && ` +
`$r8Template${config.R8Cmd} ${config.DexFlags} -injars $tmpJar --output $outDir ` +
`--no-data-resources ` + `--no-data-resources ` +
`-printmapping ${outDict} ` + `-printmapping ${outDict} ` +
`-printusage ${outUsage} ` + `-printusage ${outUsage} ` +
@@ -129,6 +134,7 @@ 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.R8Cmd}", "${config.R8Cmd}",
"${config.Zip2ZipCmd}",
"${config.SoongZipCmd}", "${config.SoongZipCmd}",
"${config.MergeZipsCmd}", "${config.MergeZipsCmd}",
}, },
@@ -156,7 +162,7 @@ var r8, r8RE = pctx.MultiCommandRemoteStaticRules("r8",
Platform: map[string]string{remoteexec.PoolKey: "${config.REJavaPool}"}, Platform: map[string]string{remoteexec.PoolKey: "${config.REJavaPool}"},
}, },
}, []string{"outDir", "outDict", "outUsage", "outUsageZip", "outUsageDir", }, []string{"outDir", "outDict", "outUsage", "outUsageZip", "outUsageDir",
"r8Flags", "zipFlags"}, []string{"implicits"}) "r8Flags", "zipFlags", "tmpJar"}, []string{"implicits"})
func (d *dexer) dexCommonFlags(ctx android.ModuleContext, minSdkVersion android.SdkSpec) []string { func (d *dexer) dexCommonFlags(ctx android.ModuleContext, minSdkVersion android.SdkSpec) []string {
flags := d.dexProperties.Dxflags flags := d.dexProperties.Dxflags
@@ -273,6 +279,7 @@ func (d *dexer) compileDex(ctx android.ModuleContext, flags javaBuilderFlags, mi
// Compile classes.jar into classes.dex and then javalib.jar // Compile classes.jar into classes.dex and then javalib.jar
javalibJar := android.PathForModuleOut(ctx, "dex", jarName).OutputPath javalibJar := android.PathForModuleOut(ctx, "dex", jarName).OutputPath
outDir := android.PathForModuleOut(ctx, "dex") outDir := android.PathForModuleOut(ctx, "dex")
tmpJar := android.PathForModuleOut(ctx, "withres-withoutdex", jarName)
zipFlags := "--ignore_missing_files" zipFlags := "--ignore_missing_files"
if proptools.Bool(d.dexProperties.Uncompress_dex) { if proptools.Bool(d.dexProperties.Uncompress_dex) {
@@ -300,6 +307,7 @@ func (d *dexer) compileDex(ctx android.ModuleContext, flags javaBuilderFlags, mi
"outUsage": proguardUsage.String(), "outUsage": proguardUsage.String(),
"outUsageZip": proguardUsageZip.String(), "outUsageZip": proguardUsageZip.String(),
"outDir": outDir.String(), "outDir": outDir.String(),
"tmpJar": tmpJar.String(),
} }
if ctx.Config().UseRBE() && ctx.Config().IsEnvTrue("RBE_R8") { if ctx.Config().UseRBE() && ctx.Config().IsEnvTrue("RBE_R8") {
rule = r8RE rule = r8RE
@@ -330,6 +338,7 @@ func (d *dexer) compileDex(ctx android.ModuleContext, flags javaBuilderFlags, mi
"d8Flags": strings.Join(append(commonFlags, d8Flags...), " "), "d8Flags": strings.Join(append(commonFlags, d8Flags...), " "),
"zipFlags": zipFlags, "zipFlags": zipFlags,
"outDir": outDir.String(), "outDir": outDir.String(),
"tmpJar": tmpJar.String(),
}, },
}) })
} }