From 870dbdc97b9ae3b1a1b8e221af1cbbb50d0bb041 Mon Sep 17 00:00:00 2001 From: Bill Yang Date: Thu, 20 Mar 2025 08:54:11 +0000 Subject: Add prepend_artifact_with_product attribute for dist Add the new attribute to feet what test_package's requirement, moving the dist output naming logic from test_package to dist. Also add 4 allowed module names for the rest of the continuous_* test packages. Ignore-AOSP-First: Because the platform_tests conversion is in internal branch currently. Bug: 399246722 Test: m dist platform_tests Change-Id: I96e690f23e801c22fe66f0f234be8a1f9a84062f --- android/androidmk.go | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'android/androidmk.go') diff --git a/android/androidmk.go b/android/androidmk.go index 7cc6aef00..e32835946 100644 --- a/android/androidmk.go +++ b/android/androidmk.go @@ -435,13 +435,18 @@ func getDistContributions(ctx ConfigAndOtherModuleProviderContext, mod Module) * suffix = *dist.Suffix } - productString := "" - if dist.Append_artifact_with_product != nil && *dist.Append_artifact_with_product { - productString = fmt.Sprintf("_%s", ctx.Config().DeviceProduct()) + prependProductString := "" + if proptools.Bool(dist.Prepend_artifact_with_product) { + prependProductString = fmt.Sprintf("%s-", ctx.Config().DeviceProduct()) } - if suffix != "" || productString != "" { - dest = strings.TrimSuffix(dest, ext) + suffix + productString + ext + appendProductString := "" + if proptools.Bool(dist.Append_artifact_with_product) { + appendProductString = fmt.Sprintf("_%s", ctx.Config().DeviceProduct()) + } + + if suffix != "" || appendProductString != "" || prependProductString != "" { + dest = prependProductString + strings.TrimSuffix(dest, ext) + suffix + appendProductString + ext } if dist.Dir != nil { -- cgit v1.2.3-59-g8ed1b