commit d485d2a10c1b15a6e441952f4ee59905990cc606
author Alex Klyubin <klyubin@google.com> Fri Mar 03 03:59:39 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Mar 03 03:59:39 2017 +0000
tree 83ecef2d37b2620543fa5c5d820ad66c590e0d91
parent decc92028b7b49a50a11c8758bceb75630dbdec8
parent 8fe478de64360567b818435d6b539bb505aa5b68

Merge "Include secilc and sepolicy conditionally, elsewhere" am: 3e78704825
am: 8fe478de64

Change-Id: I124bacdd15ad7edd1f5527005a726641c7c96d08

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 9e82bfc..e657261 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1761,6 +1761,12 @@
   $(VBOOT_SIGNER)
 endif
 
+ifeq (true,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VBOOT))
+OTATOOLS += \
+  $(FUTILITY) \
+  $(VBOOT_SIGNER)
+endif
+
 # Shared libraries.
 OTATOOLS += \
   $(HOST_LIBRARY_PATH)/libc++$(HOST_SHLIB_SUFFIX) \