Merge "configstore: add default implementation of configstore@1.0 HAL" am: 2b61f19254
am: 371f5d502c

Change-Id: I36e806744fb27829c272e3e0bb3dc1eb71465899
diff --git a/core/Makefile b/core/Makefile
index b0a03b5..fd839f7 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1793,6 +1793,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) \