commit b6838aa47d18918c329e7d544b325086c3f8883b
author Christopher Ferris <cferris@google.com> Thu Dec 12 22:01:30 2013 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Dec 12 22:01:30 2013 +0000
tree aac935051169e2c5525f7621fbf831fa6e291ab2
parent 74f27cffd9bbbd0f791e1f0f0096f706c91ad08f
parent d6b97d194353b8446ee212151a4cdbbeb71cb31f

am d6b97d19: am 2c8078fd: Merge "Fix regex for finding symbol data."

* commit 'd6b97d194353b8446ee212151a4cdbbeb71cb31f':
  Fix regex for finding symbol data.

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)), \