commit 92579193dbe1039407d8bc0c46cd6995f3d99af5
author Nick Desaulniers <ndesaulniers@google.com> Tue Aug 09 20:55:20 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Aug 09 20:55:20 2016 +0000
tree 29784f6792dd30120fa3890e1de098cfbe1f6819
parent a86a93bff52bfce3533e066225b6ef25b7863295
parent d491fcf438a2a7155f6d9ad7b295a29d4c760d02

build: sign boot.img based on BOARD_USES_RECOVERY_AS_BOOT
am: d491fcf438

Change-Id: I1e054a5eb22680fa02f19bdf979bba4f75347dd9

core/prebuilt_internal.mk

diff --git a/core/prebuilt_internal.mk b/core/prebuilt_internal.mk
index d450373..b6727fa 100644
--- a/core/prebuilt_internal.mk
+++ b/core/prebuilt_internal.mk
@@ -85,8 +85,10 @@
 
 ifeq ($(LOCAL_MODULE_CLASS),APPS)
 LOCAL_BUILT_MODULE_STEM := package.apk
+ifndef LOCAL_INSTALLED_MODULE_STEM
 LOCAL_INSTALLED_MODULE_STEM := $(LOCAL_MODULE).apk
 endif
+endif
 
 ifneq ($(filter true no_debuglink,$(my_strip_module) $(my_pack_module_relocations)),)
   ifdef LOCAL_IS_HOST_MODULE

core/version_defaults.mk

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 6a0e22c..f207185 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -113,7 +113,7 @@
   # Must be of the form "YYYY-MM-DD" on production devices.
   #
   # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty.
-  PLATFORM_SECURITY_PATCH := 2016-09-05
+  PLATFORM_SECURITY_PATCH := 2016-09-07
 endif
 
 ifeq "" "$(PLATFORM_BASE_OS)"