commit a46393129212b65c76140f0b0f0bafbbd5c4b6ca
author Chih-Hung Hsieh <chh@google.com> Thu Apr 27 22:52:35 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Apr 27 22:52:35 2017 +0000
tree 8f49f5e1606e6ebef2d0677d968021df5878fbbf
parent 925147dd7dd84a727b4d121bc9a8469d33dae83f
parent 5bc24ca63a74dd25104a0d26b2c918736fe600af

Merge "Get Android TOP from build.log file." am: 72a662a282
am: 5bc24ca63a

Change-Id: I5712b3d21d8ce5447883b0c70e0352794de8f4a2

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