From 737d0a1f84dfe4ff44fd73fa82de12c795b40e5b Mon Sep 17 00:00:00 2001 From: Jose Galmes Date: Tue, 25 May 2021 22:06:41 -0700 Subject: [PATCH] Fix change in logic introduced in https://r.android.com/1666563. https://r.android.com/c/platform/build/soong/+/1666563/3/cc/image.go#551 introduced a change in logic. Bug: 188717568 Test: source build/envsetup.sh Test: m -j nothing Change-Id: Iab27f1c3ca1a488d074f9c5c61fe071d7d445b91 --- cc/image.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cc/image.go b/cc/image.go index 47a424bc2..c6b209f08 100644 --- a/cc/image.go +++ b/cc/image.go @@ -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) {