diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-07-15 01:01:20 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-07-15 01:01:20 +0000 |
| commit | 1909bb6997e4c682ec850fd53e79ba8670bfdbb3 (patch) | |
| tree | fb64b1f4ea88a938ea41d5f10671db23da090412 | |
| parent | 0f75d1dd1dbcebc8f4657560e896b308e970a2d8 (diff) | |
| parent | 774a7580267ec9cb898f2a64b659fd85b7209926 (diff) | |
| download | build_soong-1909bb6997e4c682ec850fd53e79ba8670bfdbb3.tar.gz build_soong-1909bb6997e4c682ec850fd53e79ba8670bfdbb3.tar.bz2 build_soong-1909bb6997e4c682ec850fd53e79ba8670bfdbb3.zip | |
Snap for 6680390 from 774a7580267ec9cb898f2a64b659fd85b7209926 to rvc-release
Change-Id: I9a65e6c29391e67255bd2295d1d59595070d7b28
| -rw-r--r-- | apex/builder.go | 2 | ||||
| -rw-r--r-- | java/aar.go | 2 | ||||
| -rw-r--r-- | java/hiddenapi.go | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/apex/builder.go b/apex/builder.go index e1b2dab0..9da6ef85 100644 --- a/apex/builder.go +++ b/apex/builder.go @@ -343,7 +343,7 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext) { } else { if fi.class == appSet { 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 { copyCommands = append(copyCommands, "cp -f "+fi.builtFile.String()+" "+destPath) } diff --git a/java/aar.go b/java/aar.go index 53b50d60..8dd752f1 100644 --- a/java/aar.go +++ b/java/aar.go @@ -641,7 +641,7 @@ func (a *AARImport) DepsMutator(ctx android.BottomUpMutatorContext) { var unzipAAR = pctx.AndroidStaticRule("unzipAAR", blueprint.RuleParams{ 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") diff --git a/java/hiddenapi.go b/java/hiddenapi.go index 130b6349..b5a02178 100644 --- a/java/hiddenapi.go +++ b/java/hiddenapi.go @@ -146,7 +146,7 @@ func (h *hiddenAPI) hiddenAPIGenerateCSV(ctx android.ModuleContext, flagsCSV, me var hiddenAPIEncodeDexRule = pctx.AndroidStaticRule("hiddenAPIEncodeDex", blueprint.RuleParams{ 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 echo "--input-dex=$${INPUT_DEX}"; echo "--output-dex=$tmpDir/dex-output/$$(basename $${INPUT_DEX})"; |