commit 925147dd7dd84a727b4d121bc9a8469d33dae83f
author Tao Bao <tbao@google.com> Thu Apr 27 16:24:10 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Apr 27 16:24:10 2017 +0000
tree 85bae723d7a91fc8b8c599599c98d99d2f7f9cdb
parent de12e39af70fba30e3fa22754d17ef9bc0f7a617
parent 5e15d3cce1c520c4e48fb4cea2d43b932c2e8668

Merge "Revert "Revert "Add compatibility metadata to OTA package""" am: f9937b5c24
am: 5e15d3cce1

Change-Id: Icf50f5a83cc0dc5d0db413f6b4daea532bfbb9f8

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