commit d97130751f5fa8fb6bcf222c78ad2dd7a66cc42e
author Bowgo Tsai <bowgotsai@google.com> Thu Mar 21 00:24:04 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Mar 21 00:24:04 2019 -0700
tree bef432ad1803b6e8b1123755e3a94789b6965422
parent 5c38a6234d3200f25db2b485268394ff39f02666
parent 5ce2f09a8e4016e9dcd7c8279e970b08e45df5c6

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

Change-Id: I79f0f00969e30d53489f7e5a28423110a94e78e5

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 6c73ea1..2a2488c 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -736,8 +736,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
 
 # -----------------------------------------------------------------