commit 3157096157778278a34dd5d03cff24023d69251e
author Ying Wang <wangying@android.com> Fri Dec 13 00:12:47 2013 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Dec 13 00:12:47 2013 +0000
tree 178c9b9a4badbb2e4a44e853e4f7c62b2fb674d0
parent b6838aa47d18918c329e7d544b325086c3f8883b
parent c5e3539b6fe67288d097d29b68d5f669b97a71ad

am c5e3539b: am 5859f105: Merge "Enable NX protections"

* commit 'c5e3539b6fe67288d097d29b68d5f669b97a71ad':
  Enable NX protections

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 8a1175e..9e2fc8c 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -623,6 +623,11 @@
 # -----------------------------------------------------------------
 # Recovery image
 
+# Recovery is disabled in PDK builds
+ifeq ($(TARGET_BUILD_PDK),true)
+TARGET_NO_RECOVERY := true
+endif
+
 # If neither TARGET_NO_KERNEL nor TARGET_NO_RECOVERY are true
 ifeq (,$(filter true, $(TARGET_NO_KERNEL) $(TARGET_NO_RECOVERY)))
 

core/multi_prebuilt.mk

diff --git a/core/multi_prebuilt.mk b/core/multi_prebuilt.mk
index be60e2f..bc85cea 100644
--- a/core/multi_prebuilt.mk
+++ b/core/multi_prebuilt.mk
@@ -69,7 +69,11 @@
   $(if $(7), \
     $(eval LOCAL_BUILT_MODULE_STEM := $(7)) \
    , \
-    $(eval LOCAL_BUILT_MODULE_STEM := $(notdir $(LOCAL_SRC_FILES))) \
+    $(if $(word 2,$(tw)), \
+      $(eval LOCAL_BUILT_MODULE_STEM := $(LOCAL_MODULE)$(suffix $(LOCAL_SRC_FILES))) \
+     , \
+      $(eval LOCAL_BUILT_MODULE_STEM := $(notdir $(LOCAL_SRC_FILES))) \
+     ) \
    ) \
   $(eval LOCAL_MODULE_SUFFIX := $(suffix $(LOCAL_SRC_FILES))) \
   $(if $(filter user,$(TARGET_BUILD_VARIANT)), \