commit 27fdb815114c9b4662ded130c2e05493a11da4f3
author Calin Juravle <calin@google.com> Fri Mar 03 00:21:34 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Mar 03 00:21:34 2017 +0000
tree 8a4eaa664657eb5b7d1e697f7e5c49d23d5f61d7
parent 49ba2bbe7e10a0b29b289f10b40994d9274d005b
parent a5ab384e1c0230b038f6d973d0967b5149b676da

Merge "Enable secondary dex compilation in the background dexopt job" am: 34200a1ad1
am: a5ab384e1c

Change-Id: I68d3c5ae807d0a61a80ceddc7add2f0cdcfb1cc8

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