Merge "Desugar when javac version is 1.7" am: ed44a54991
am: ce9dfdeee6
Change-Id: I4cf83e8ea97a0ebdc8f25d569fd997a01a603a4d
diff --git a/core/Makefile b/core/Makefile
index 3148792..5cbd01d 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1793,6 +1793,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) \
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 7cca9e2..e99a023 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -188,7 +188,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-05-05
endif
ifndef PLATFORM_BASE_OS