Merge "Fix prebuilts of overridden apps"

2022-05-17 19:03:42 +00:00
parent 7583481570 aaa0c1ffcd
commit 822029166d
3 changed files with 36 additions and 6 deletions
--- a/java/androidmk.go
+++ b/java/androidmk.go
@@ -324,7 +324,7 @@ func (binary *Binary) AndroidMkEntries() []android.AndroidMkEntries {
 }

 func (app *AndroidApp) AndroidMkEntries() []android.AndroidMkEntries {
-	if app.hideApexVariantFromMake || app.appProperties.HideFromMake {
+	if app.hideApexVariantFromMake || app.IsHideFromMake() {
 		return []android.AndroidMkEntries{android.AndroidMkEntries{
 			Disabled: true,
 		}}