commit d2f336664c9f348db7a158f4983786471f9a2cf8
author Yueyao Zhu <yueyao@google.com> Mon May 15 16:59:56 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon May 15 16:59:56 2017 +0000
tree 2b9ddb8ee84a95fb7b700b71d184f65f0ec8beaa
parent c4977665f1017bd95e0032a5069e21bdc159f86c
parent 793a9bb490a97905189602eade2209c672b4f650

Merge "add dtbo support for ota" am: 294d5c5f07
am: 793a9bb490

Change-Id: Ia44e579c6c642ca745aa7d38ce73d3c89dd9a0c8

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 0b63915..fefcc9e 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1904,6 +1904,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 5a89fc9..ff60934 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -186,7 +186,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