From ba0dff954ef4f1cdab289dde9e316c10eecdc082 Mon Sep 17 00:00:00 2001
From: Egor Starkov <starkov.egor@gmail.com>
Date: Wed, 24 Mar 2010 06:07:45 -0400
Subject: [PATCH] Bug 552385 - "Memory" directory is compiling twice while
 building fennec. r=ted.mielczarek

---
 Makefile.in     | 7 ++++++-
 allmakefiles.sh | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 0eb210c3cc74..dc20351f7d8f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -61,10 +61,15 @@ TIERS += base
 tier_base_dirs = \
 	config \
 	build \
-	memory \
 	probes \
 	$(NULL)
 
+ifndef LIBXUL_SDK
+tier_base_dirs += \
+	memory \
+	$(NULL)
+endif
+
 ifdef COMPILE_ENVIRONMENT
 include $(topsrcdir)/$(MOZ_BUILD_APP)/build.mk
 endif
diff --git a/allmakefiles.sh b/allmakefiles.sh
index 11723715b33d..89bd0ef034bb 100755
--- a/allmakefiles.sh
+++ b/allmakefiles.sh
@@ -85,7 +85,7 @@ if [ "$WINCE" ]; then
   "
 fi
 
-if [ "$MOZ_MEMORY" ]; then
+if [ "$MOZ_MEMORY" -a "$LIBXUL_SDK" -eq ""]; then
   add_makefiles "
     memory/jemalloc/Makefile
   "