commit decc92028b7b49a50a11c8758bceb75630dbdec8
author Mathieu Chartier <mathieuc@google.com> Fri Mar 03 01:20:13 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Mar 03 01:20:13 2017 +0000
tree eb00bd12c20129acf645180ba2936a3c5bfe9398
parent 27fdb815114c9b4662ded130c2e05493a11da4f3
parent c185f742e1b87f66659d56ef71334383ae9b023a

Merge "Add local preopt options for generating app image and profile" am: fea31c0b9e
am: c185f742e1

Change-Id: Ifbe9e3247a1aed1c63918fc79da180880efb2e6b

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