commit 24c6516e1dd84215f3466daf30be2f2c258ed2ac
author Richard Uhler <ruhler@google.com> Thu Mar 02 09:26:23 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Mar 02 09:26:23 2017 +0000
tree 9c089e87d800c506d914ccc35b2c79fa1c4d72b5
parent e1de7cd45a87d32f9f779217d65b3e9b07494e68
parent bf0fea29e61e191828c87ac45f6c14b4b639fc95

Merge "Don't include patch information for dex preopt." am: 6f8e0d06e4
am: bf0fea29e6

Change-Id: I1f9c79b869f4a270e7ce3524f4bbb115fdef2f90

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