Merge "Sort files in sdk snapshot zip to ensure consistent behavior"
This commit is contained in:
commit
c5e02caef3
2 changed files with 4 additions and 4 deletions
|
@ -1339,9 +1339,9 @@ java_sdk_library_import {
|
|||
.intermediates/myjavalib.stubs.source.module_lib/android_common/metalava/myjavalib.stubs.source.module_lib_removed.txt -> sdk_library/module-lib/myjavalib-removed.txt
|
||||
`),
|
||||
checkMergeZips(
|
||||
".intermediates/mysdk/common_os/tmp/sdk_library/module-lib/myjavalib_stub_sources.zip",
|
||||
".intermediates/mysdk/common_os/tmp/sdk_library/public/myjavalib_stub_sources.zip",
|
||||
".intermediates/mysdk/common_os/tmp/sdk_library/system/myjavalib_stub_sources.zip",
|
||||
".intermediates/mysdk/common_os/tmp/sdk_library/module-lib/myjavalib_stub_sources.zip",
|
||||
),
|
||||
)
|
||||
}
|
||||
|
|
|
@ -108,7 +108,7 @@ var (
|
|||
|
||||
mergeZips = pctx.AndroidStaticRule("SnapshotMergeZips",
|
||||
blueprint.RuleParams{
|
||||
Command: `${config.MergeZipsCmd} $out $in`,
|
||||
Command: `${config.MergeZipsCmd} -s $out $in`,
|
||||
CommandDeps: []string{
|
||||
"${config.MergeZipsCmd}",
|
||||
},
|
||||
|
@ -481,7 +481,7 @@ be unnecessary as every module in the sdk already has its own licenses property.
|
|||
// Copy the build number file into the snapshot.
|
||||
builder.CopyToSnapshot(ctx.Config().BuildNumberFile(ctx), BUILD_NUMBER_FILE)
|
||||
|
||||
filesToZip := builder.filesToZip
|
||||
filesToZip := android.SortedUniquePaths(builder.filesToZip)
|
||||
|
||||
// zip them all
|
||||
zipPath := fmt.Sprintf("%s%s.zip", ctx.ModuleName(), snapshotFileSuffix)
|
||||
|
@ -517,7 +517,7 @@ be unnecessary as every module in the sdk already has its own licenses property.
|
|||
Description: outputDesc,
|
||||
Rule: mergeZips,
|
||||
Input: zipFile,
|
||||
Inputs: builder.zipsToMerge,
|
||||
Inputs: android.SortedUniquePaths(builder.zipsToMerge),
|
||||
Output: outputZipFile,
|
||||
})
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue