Merge "Ensure /system/vendor symlink exists in target-files-package" am: ac8b2ab702
am: 5179e70cc3
Change-Id: I3e834d540c4b59c1499db2bd425cce2ef39ad986
diff --git a/core/Makefile b/core/Makefile
index 3a0d343..d1f5bd1 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 7cca9e2..e99a023 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -188,7 +188,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