Merge "Don't preopt system server apps in system_other." am: f53ebefae3
am: bd0518ab55
Change-Id: I4b4386071028792e24b7af123e6a729172245d92
diff --git a/core/Makefile b/core/Makefile
index 5d44954..977f4b9 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1853,6 +1853,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 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