Bug 939611 - Build storage/src in unified mode; r=asuth

storage/src/moz.build

@@ -11,16 +11,14 @@ EXPORTS.mozilla.storage += [
     'Variant_inl.h',
 ]
 
-SOURCES += [
+UNIFIED_SOURCES += [
     'FileSystemModule.cpp',
     'mozStorageArgValueArray.cpp',
     'mozStorageAsyncStatement.cpp',
     'mozStorageAsyncStatementExecution.cpp',
     'mozStorageAsyncStatementJSHelper.cpp',
     'mozStorageAsyncStatementParams.cpp',
-    'mozStorageBindingParams.cpp',
     'mozStorageBindingParamsArray.cpp',
-    'mozStorageConnection.cpp',
     'mozStorageError.cpp',
     'mozStoragePrivateHelpers.cpp',
     'mozStorageResultSet.cpp',
@@ -37,6 +35,12 @@ SOURCES += [
     'VacuumManager.cpp',
 ]
 
+# These files need to be built separately because they #include variantToSQLiteT_impl.h.
+SOURCES += [
+    'mozStorageBindingParams.cpp',
+    'mozStorageConnection.cpp',
+]
+
 LIBRARY_NAME = 'storage_s'
 
 LIBXUL_LIBRARY = True

storage/src/mozStorageService.cpp

@@ -35,6 +35,13 @@
 #include "nsIPromptService.h"
 #include "nsIMemoryReporter.h"
 
+#ifdef MOZ_STORAGE_MEMORY
+#  include "mozmemory.h"
+#  ifdef MOZ_DMD
+#    include "DMD.h"
+#  endif
+#endif
+
 ////////////////////////////////////////////////////////////////////////////////
 //// Defines
 
@@ -349,7 +356,6 @@ Service::shutdown()
 sqlite3_vfs *ConstructTelemetryVFS();
 
 #ifdef MOZ_STORAGE_MEMORY
-#  include "mozmemory.h"
 
 namespace {
 
@@ -373,8 +379,6 @@ namespace {
 
 #ifdef MOZ_DMD
 
-#include "DMD.h"
-
 // sqlite does its own memory accounting, and we use its numbers in our memory
 // reporters.  But we don't want sqlite's heap blocks to show up in DMD's
 // output as unreported, so we mark them as reported when they're allocated and