From e691aef7b1668072870a80f5c45b2f41f1e1d476 Mon Sep 17 00:00:00 2001 From: Bowgo Tsai Date: Tue, 4 Jan 2022 14:33:43 +0800 Subject: [PATCH] Calls check-and-set-avb-args() when the system.img exists Some targets, e.g., the newly added `gki_arm64`: https://r.android.com/1935340, have no system.img. To avoid the build error when making the vbmeta.img on a no-system-image target, only sets system.img's AVB settings when it exists,. Bug: 212486689 Test: `lunch gki_arm64-userdebug; make` with BOARD_AVB_ENABLE := true Change-Id: I5e3c531e74116e421506a86ffce83848e7a9d6ea --- core/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/Makefile b/core/Makefile index 4c1ae514cc..42e04fa382 100644 --- a/core/Makefile +++ b/core/Makefile @@ -3819,7 +3819,9 @@ ifdef INSTALLED_VENDOR_BOOTIMAGE_TARGET $(eval $(call check-and-set-avb-args,vendor_boot)) endif +ifdef INSTALLED_SYSTEMIMAGE_TARGET $(eval $(call check-and-set-avb-args,system)) +endif ifdef INSTALLED_VENDORIMAGE_TARGET $(eval $(call check-and-set-avb-args,vendor))