commit 09ab1b8c67667ef28b8af860232720c22e6194d8
author Andreas Gampe <agampe@google.com> Thu Mar 30 01:23:52 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Mar 30 01:23:52 2017 +0000
tree 557882523dfc6484b6d8cadf3853b056420e4674
parent af35fe9424b93e573a0f412597d6cf42fe44dd33
parent 4ec27c88f5dc6b82a75b3824f4904c7eb3d57fa3

Merge "Build: ASAN in system" am: 85473982fb
am: 4ec27c88f5

Change-Id: Ied73489f4c7b1064b1dfd52c98c5989ac2c81646

core/Makefile

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) \

core/version_defaults.mk

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