Merge "Fix change in logic introduced in https://r.android.com/1666563." am: 581dc930b2

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1718372

Change-Id: I106e25cfb1d9dabc72dba4f6d621ac4aeedf28ea
This commit is contained in:
Jose "Pepe" Galmes
2021-05-26 21:28:40 +00:00
committed by Automerger Merge Worker

View File

@@ -579,7 +579,7 @@ func MutateImage(mctx android.BaseModuleContext, m ImageMutatableModule) {
// If using a snapshot, the recovery variant under AOSP directories is not needed,
// except for kernel headers, which needs all variants.
if m.KernelHeadersDecorator() &&
if !m.KernelHeadersDecorator() &&
!m.IsSnapshotPrebuilt() &&
usingRecoverySnapshot &&
!isRecoveryProprietaryModule(mctx) {