tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Use unzip -DD" am: b7cea24fe3 am: cae5903677

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

Change-Id: I68b97b33bd19206dfd96aca36bf4575a0bca5459
This commit is contained in:
Colin Cross 2020-07-13 06:21:07 +00:00 committed by Automerger Merge Worker
commit 56b330f8e7
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apex/builder.go
View file

@ -390,7 +390,7 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext) {
} else { } else {
if fi.class == appSet { if fi.class == appSet {
copyCommands = append(copyCommands, copyCommands = append(copyCommands,
fmt.Sprintf("unzip -q -d %s %s", destPathDir, fi.builtFile.String())) fmt.Sprintf("unzip -qDD -d %s %s", destPathDir, fi.builtFile.String()))
} else { } else {
copyCommands = append(copyCommands, "cp -f "+fi.builtFile.String()+" "+destPath) copyCommands = append(copyCommands, "cp -f "+fi.builtFile.String()+" "+destPath)
} }

2
java/aar.go
View file

@ -641,7 +641,7 @@ func (a *AARImport) DepsMutator(ctx android.BottomUpMutatorContext) {
var unzipAAR = pctx.AndroidStaticRule("unzipAAR", var unzipAAR = pctx.AndroidStaticRule("unzipAAR",
blueprint.RuleParams{ blueprint.RuleParams{
Command: `rm -rf $outDir && mkdir -p $outDir && ` + Command: `rm -rf $outDir && mkdir -p $outDir && ` +
`unzip -qo -d $outDir $in && rm -rf $outDir/res && touch $out`, `unzip -qoDD -d $outDir $in && rm -rf $outDir/res && touch $out`,
}, },
"outDir") "outDir")

2
java/hiddenapi.go
View file

@ -146,7 +146,7 @@ func (h *hiddenAPI) hiddenAPIGenerateCSV(ctx android.ModuleContext, flagsCSV, me
var hiddenAPIEncodeDexRule = pctx.AndroidStaticRule("hiddenAPIEncodeDex", blueprint.RuleParams{ var hiddenAPIEncodeDexRule = pctx.AndroidStaticRule("hiddenAPIEncodeDex", blueprint.RuleParams{
Command: `rm -rf $tmpDir && mkdir -p $tmpDir && mkdir $tmpDir/dex-input && mkdir $tmpDir/dex-output && Command: `rm -rf $tmpDir && mkdir -p $tmpDir && mkdir $tmpDir/dex-input && mkdir $tmpDir/dex-output &&
unzip -o -q $in 'classes*.dex' -d $tmpDir/dex-input && unzip -qoDD $in 'classes*.dex' -d $tmpDir/dex-input &&
for INPUT_DEX in $$(find $tmpDir/dex-input -maxdepth 1 -name 'classes*.dex' | sort); do for INPUT_DEX in $$(find $tmpDir/dex-input -maxdepth 1 -name 'classes*.dex' | sort); do
echo "--input-dex=$${INPUT_DEX}"; echo "--input-dex=$${INPUT_DEX}";
echo "--output-dex=$tmpDir/dex-output/$$(basename $${INPUT_DEX})"; echo "--output-dex=$tmpDir/dex-output/$$(basename $${INPUT_DEX})";