commit 9343fd786148f0d6d8a8099aa938edea0b4eefe7
author Benoit Lamarche <benoitlamarche@google.com> Wed Mar 29 08:56:20 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Mar 29 08:56:20 2017 +0000
tree b14756c53b11cb7e583b80c6d88f8bb7954aa85e
parent 5148a458a28275721fc6c6666018e5b6d9604a35
parent 8488228d9a13274177bbf86df89bc00e77c807fe

Merge "Changing default Jack arguments." am: cadf11068c
am: 8488228d9a

Change-Id: I3f1ce5f5c0d24afb890b7b2b08d89091f1b24feb

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 9667485..df44349 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 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