summaryrefslogtreecommitdiff
path: root/sdk/sdk.go
diff options
context:
space:
mode:
author Mathew Inwood <mathewi@google.com> 2021-05-06 15:21:04 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2021-05-06 15:21:04 +0000
commit7e554ec2de3bf1949f92b769d3e71c341c969154 (patch)
tree3501e4b0ee2cd7a84ed75d07415b0f6322e5a7ce /sdk/sdk.go
parent2cd736c648660ac49746b3e404006bced03ba343 (diff)
parent60770e22501d1141fbb871cdc372fee1ea8f0370 (diff)
Merge "Ensure current.zip is put in the right place."
Diffstat (limited to 'sdk/sdk.go')
-rw-r--r--sdk/sdk.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/sdk/sdk.go b/sdk/sdk.go
index 95a49306d..2f56de69d 100644
--- a/sdk/sdk.go
+++ b/sdk/sdk.go
@@ -307,8 +307,8 @@ func (s *sdk) GenerateAndroidBuildActions(ctx android.ModuleContext) {
// Generate the snapshot from the member info.
p := s.buildSnapshot(ctx, sdkVariants)
- s.snapshotFile = android.OptionalPathForPath(p)
- ctx.InstallFile(android.PathForMainlineSdksInstall(ctx), s.Name()+"-current.zip", p)
+ zip := ctx.InstallFile(android.PathForMainlineSdksInstall(ctx), p.Base(), p)
+ s.snapshotFile = android.OptionalPathForPath(zip)
}
}