From 60770e22501d1141fbb871cdc372fee1ea8f0370 Mon Sep 17 00:00:00 2001 From: Mathew Inwood Date: Wed, 5 May 2021 17:00:29 +0100 Subject: [PATCH] Ensure current.zip is put in the right place. Using the InstallFile as the snapshot ensure that the artifact in out/soong/mainline-sdks/ is built when building the sdk target. Test: m ipsec-module-sdk Change-Id: I45ce6001dbae3a7a9c4cf50f8d7d5d67f94dbcb3 --- sdk/sdk.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/sdk.go b/sdk/sdk.go index b60fb184f..d3788c4be 100644 --- a/sdk/sdk.go +++ b/sdk/sdk.go @@ -299,8 +299,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) } }