commit 4926df7b5ff1e6f4109817d5a716d6e57ab91ea4
author Dimitry Ivanov <dimitry@google.com> Sat Mar 25 05:23:48 2017 +0000
committer android-build-merger <android-build-merger@google.com> Sat Mar 25 05:23:48 2017 +0000
tree 8e6638975a9668e6502ac3b3df002534bbcae0e1
parent 60ff056b6f6923b5be8a693c4bdf081859b73063
parent 3fd5bf0f82a8a4f8caefbf46a5493c7e6b6b5698

Merge "Add ld.config.txt to rootdir/etc" am: 86559441a1
am: 3fd5bf0f82

Change-Id: If88cea58d006708fd7f31507cbcb3efd32293247

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 5cd2fe4..0b874f2 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) \

core/version_defaults.mk

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