Bug 552385 - "Memory" directory is compiling twice while building fennec. r=ted.mielczarek

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

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
   "