Merge "Enforce RROs for all the build-time ROs" am: 4b4e203a0b
am: 2f92aa78f4
Change-Id: Ia7fbae5bcde02b847425fe1b66fa2f97cc9b249e
diff --git a/core/Makefile b/core/Makefile
index 2ef9842..bd4f48a 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1816,6 +1816,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 6b35581..d877c7a 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -165,7 +165,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