commit 5ce2f09a8e4016e9dcd7c8279e970b08e45df5c6
author Bowgo Tsai <bowgotsai@google.com> Thu Mar 21 00:18:52 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Mar 21 00:18:52 2019 -0700
tree 36954b1f61f5432bf32e58b67328149dd0bed0ef
parent 1485ea8707a5ffbce92dc23295a89016ada637c8
parent 20d5f0f821ec2aab3a7251925523a3478b6222fd

Merge "Only build system_other.avbpubkey when AVB is enabled" am: dce018769f
am: 20d5f0f821

Change-Id: I7e505c8d169612e3eed0a5f54b126271d4af0577

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
 
 # -----------------------------------------------------------------