commit ced2e4899890f8065744a15591b00685bdc2bd37
author Elliott Hughes <enh@google.com> Mon Apr 03 21:31:40 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Apr 03 21:31:40 2017 +0000
tree b44678ead57bdf45ba7f94daf2389f45f46aa95f
parent 7206a3b38c82242c56c43af39c662b9ee2c7ebf2
parent d83bb4193a003e649080e1c87b8552e29dd5a312

Merge "fsconfig: Use defined macro for masking" am: 35eaf52ee2
am: d83bb4193a

Change-Id: Ie5fb625707a7e59bd623130617515674c908f0a6

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 510cd98..17ae710 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1818,6 +1818,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) \

core/version_defaults.mk

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index ba07200..3e57a3d 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -180,7 +180,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