StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make "overrides" attribute of Android_app overridable"

Browse Source
This commit is contained in:
Treehugger Robot
2022-05-17 06:38:19 +00:00
committed by Gerrit Code Review
parent 0de6fdde4d 198f589222
commit 7583481570
4 changed files with 118 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/androidmk.go
View File

@@ -424,8 +424,8 @@ func (app *AndroidApp) AndroidMkEntries() []android.AndroidMkEntries {
func (a *AndroidApp) getOverriddenPackages() []string {
var overridden []string
if len(a.appProperties.Overrides) > 0 {
overridden = append(overridden, a.appProperties.Overrides...)
if len(a.overridableAppProperties.Overrides) > 0 {
overridden = append(overridden, a.overridableAppProperties.Overrides...)
}
// When APK name is overridden via PRODUCT_PACKAGE_NAME_OVERRIDES
// ensure that the original name is overridden.