diff options
| author | 2022-01-11 08:11:46 +0000 | |
|---|---|---|
| committer | 2022-01-11 08:11:46 +0000 | |
| commit | d887d9b45241788afbcd32c3480980e43c55665e (patch) | |
| tree | 5365af5b202f0abc2a724b531a2467682b63ba45 /java/androidmk.go | |
| parent | 2715e898c5af3d4f998c56824d95ac7cb929808f (diff) | |
| parent | f7e9e1f434e2604761e485f2a9d1b34c10f402e2 (diff) | |
Merge changes I9ad66ea2,I4c95b77b am: 57271b9f45 am: a7c0107744 am: 16213c6bbe am: f7e9e1f434
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1934955
Change-Id: I5e05dbd3bca3c14bb52ad383c8af3eaf491222a1
Diffstat (limited to 'java/androidmk.go')
| -rw-r--r-- | java/androidmk.go | 6 |
1 files changed, 4 insertions, 2 deletions
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 } |