Merge "Fix modules.dep breakage with multiple module dependencies" am: 73461abd0c
am: 9c0198e6e9
Change-Id: I4e1ecf13d31bec16a4fe44358c1dd8def0203916
diff --git a/core/Makefile b/core/Makefile
index 7de340f..40457dc 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1794,6 +1794,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 a3267e7..8ff9471 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -190,7 +190,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