Bug 1084210 - Simplify tree traversal for memory/replace. r=mshal

memory/moz.build

@@ -12,6 +12,5 @@ if CONFIG['MOZ_JEMALLOC3'] or CONFIG['MOZ_REPLACE_MALLOC']:
 
 DIRS += ['build']
 
-if CONFIG['MOZ_REPLACE_MALLOC_LINKAGE'] == 'dummy library':
-    DIRS += ['replace/dummy']
-
+if CONFIG['MOZ_REPLACE_MALLOC']:
+    DIRS += ['replace']

memory/replace/moz.build

@@ -8,4 +8,8 @@
 if not CONFIG['MOZ_JEMALLOC3']:
     DIRS += ['jemalloc']
 
-DISABLE_STL_WRAPPING = True
+if CONFIG['MOZ_REPLACE_MALLOC_LINKAGE'] == 'dummy library':
+    DIRS += ['dummy']
+
+if CONFIG['MOZ_DMD']:
+    DIRS += ['dmd']

toolkit/toolkit.mozbuild

@@ -24,9 +24,6 @@ if CONFIG['MOZ_UPDATER']:
 if CONFIG['NS_TRACE_MALLOC']:
     DIRS += ['/tools/trace-malloc/lib']
 
-if CONFIG['MOZ_DMD']:
-    DIRS += ['/memory/replace/dmd']
-
 DIRS += [
     '/config/external/freetype2',
     '/xpcom',
@@ -164,9 +161,6 @@ DIRS += [
     '/toolkit/library',
 ]
 
-if CONFIG['MOZ_REPLACE_MALLOC']:
-    DIRS += ['/memory/replace']
-
 if CONFIG['NS_TRACE_MALLOC']:
     DIRS += ['/tools/trace-malloc']