commit dce018769fa91e9a26444f0fc68eb1428c9bc68c
author Bowgo Tsai <bowgotsai@google.com> Thu Mar 21 07:01:53 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 21 07:01:53 2019 +0000
tree a0b3117396f6ded73ac644624854579a666c8809
parent 30dda1da5e4f3ad32ea70afd4707d9ca8ac538da
parent 8802b7119dd4ce592c171d004f1f9ca4ed8926b4

Merge "Only build system_other.avbpubkey when AVB is enabled"

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index a0aa94f..69c75ca 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -732,8 +732,10 @@
 # -----------------------------------------------------------------
 # build /product/etc/security/avb/system_other.avbpubkey if needed
 ifdef BUILDING_SYSTEM_OTHER_IMAGE
+ifeq ($(BOARD_AVB_ENABLE),true)
 INSTALLED_PRODUCT_SYSTEM_OTHER_AVBKEY_TARGET := $(TARGET_OUT_PRODUCT_ETC)/security/avb/system_other.avbpubkey
 ALL_DEFAULT_INSTALLED_MODULES += $(INSTALLED_PRODUCT_SYSTEM_OTHER_AVBKEY_TARGET)
+endif # BOARD_AVB_ENABLE
 endif # BUILDING_SYSTEM_OTHER_IMAGE
 
 # -----------------------------------------------------------------