Merge changes I0508b2cc,I3d6bbc36 am: 767cb900a1
am: 235e342639
Change-Id: I9ed2530dd33c231db92f6e10dcea8b2baaba123f
diff --git a/core/Makefile b/core/Makefile
index ab88b90..ca89b34 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) \
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index a7a3565..519f72a 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -183,7 +183,7 @@
# It must be of the form "YYYY-MM-DD" on production devices.
# It must match one of the Android Security Patch Level strings of the Public Security Bulletins.
# If there is no $PLATFORM_SECURITY_PATCH set, keep it empty.
- PLATFORM_SECURITY_PATCH := 2017-04-05
+ PLATFORM_SECURITY_PATCH := 2017-05-05
endif
ifndef PLATFORM_BASE_OS