Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d783bbba authored by Colin Cross's avatar Colin Cross
Browse files

Use unzip -DD 

We put reproducible timestamps in zip files so that the artifacts
are consistent, but that leads to old timestamps in the output
directory if they are unzipped as part of the build.  Use
unzip -DD when unzipping to update the timestamps.

Bug: 161015009
Test: touch -d 2020-01-01 ref; find $OUT/system -not -newer ref
Change-Id: I70407a627cb070e24be510faa6a774e3d9eae3a8
parent 41405cc2

apex/builder.go

+1 −1
Original line number Diff line number Diff line
@@ -390,7 +390,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)

			}

java/aar.go

+1 −1
Original line number Diff line number Diff line
@@ -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")

java/hiddenapi.go

+1 −1
Original line number Diff line number Diff line
@@ -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})";