commit 225fd8057f3ee14689e03c6bb44e82602f91548e
author Nicolas Geoffray <ngeoffray@google.com> Thu Apr 27 11:56:38 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Apr 27 11:56:38 2017 +0000
tree 7aafa5210a57d17eeb7350d9659d37a3905bda00
parent 6d63c8a7d56ae192fb187951abbcb894f7db84e3
parent 39568a678320f33435e1f779da2bb91b8ddc6dba

Merge "Update build files to new compiler filters." am: 6c8c20dd5b
am: 39568a6783

Change-Id: Ic31ecc16969b15f961f8126bade07a7daf42ec9d

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 0a99376..0ec6fb3 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1828,6 +1828,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..b1781b8 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-06-05
 endif
 
 ifndef PLATFORM_BASE_OS