commit 1898053ffb5ebb5d20d45b6e226f3a552cb9ec7e
author Narayan Kamath <narayan@google.com> Wed Apr 26 08:33:01 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Apr 26 08:33:01 2017 +0000
tree 8ccb4551d0d812d16dca80031d643de95d546ddc
parent bc70f0a30e5b30372ac37ac631a847ee0ed7edf1
parent ba8e91ded32412d393797c7c6b063c7870b21529

Merge "Update stale comment for dalvik.vm.stack-trace-file." am: 5b50433f19
am: ba8e91ded3

Change-Id: I82652e5bd3c00f8f9dfd7cf25d94502f43431832

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