From 29e2f6d2c4371598ea9217ef19d3cdcf7eb30c91 Mon Sep 17 00:00:00 2001 From: Jooyung Han Date: Sat, 8 Jan 2022 12:13:59 +0900 Subject: Use 'stem' to override APK name When android_app.stem is set, use it as the APK name like other module types. Bug: 193504286 Test: m (soong test) Change-Id: I4c95b77be382cff3cfecaf6ce38f99aed9f3238f --- java/androidmk.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'java/androidmk.go') diff --git a/java/androidmk.go b/java/androidmk.go index 19fe7e2fb..b930441f3 100644 --- a/java/androidmk.go +++ b/java/androidmk.go @@ -433,8 +433,10 @@ func (a *AndroidApp) getOverriddenPackages() []string { if len(a.appProperties.Overrides) > 0 { overridden = append(overridden, a.appProperties.Overrides...) } - if a.Name() != a.installApkName { - overridden = append(overridden, a.Name()) + // When APK name is overridden via PRODUCT_PACKAGE_NAME_OVERRIDES + // ensure that the original name is overridden. + if a.Stem() != a.installApkName { + overridden = append(overridden, a.Stem()) } return overridden } -- cgit v1.2.3-59-g8ed1b