commit 2f2d4b79b5f4e8168c43a2677d96316a9b41edcf
author Vijay Venkatraman <vijaykv@google.com> Fri Mar 03 04:18:09 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Mar 03 04:18:09 2017 +0000
tree 7c5ef8a312a903be20c1caeccaedfef1c003689e
parent d485d2a10c1b15a6e441952f4ee59905990cc606
parent e4f88be6ed7dc351dc07092c6bfa9463f9d52f70

Merge "Fix for compile error when BUILD_HEADER_LIBRARY is used" am: 69e8252aec
am: e4f88be6ed

Change-Id: Ia7e126b063378e454b3a0d41c546c41de025c8f0

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) \