Merge "Fix prebuilts of overridden apps" am: 822029166d
am: 7a8e610703
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2099730 Change-Id: Ib50d77543a68c07a7c1f2391225132cf0c91b57a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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,
|
||||
}}
|
||||
|
Reference in New Issue
Block a user