Bug 1164717 - Flatten storage/public/ directory. r=mak

storage/moz.build

@@ -4,7 +4,47 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DIRS += ['public', 'src', 'build']
+DIRS += ['src', 'build']
 
 TEST_DIRS += ['test']
 
+XPIDL_SOURCES += [
+    'mozIStorageAggregateFunction.idl',
+    'mozIStorageAsyncConnection.idl',
+    'mozIStorageAsyncStatement.idl',
+    'mozIStorageBaseStatement.idl',
+    'mozIStorageBindingParams.idl',
+    'mozIStorageBindingParamsArray.idl',
+    'mozIStorageCompletionCallback.idl',
+    'mozIStorageConnection.idl',
+    'mozIStorageError.idl',
+    'mozIStorageFunction.idl',
+    'mozIStoragePendingStatement.idl',
+    'mozIStorageProgressHandler.idl',
+    'mozIStorageResultSet.idl',
+    'mozIStorageRow.idl',
+    'mozIStorageService.idl',
+    'mozIStorageStatement.idl',
+    'mozIStorageStatementCallback.idl',
+    'mozIStorageStatementParams.idl',
+    'mozIStorageStatementRow.idl',
+    'mozIStorageVacuumParticipant.idl',
+    'mozIStorageValueArray.idl',
+]
+
+XPIDL_MODULE = 'storage'
+
+EXPORTS += [
+    'mozStorageHelper.h',
+]
+
+EXPORTS.mozilla += [
+    'storage.h',
+]
+
+# NOTE When adding something to this list, you probably need to add it to the
+#      storage.h file too.
+EXPORTS.mozilla.storage += [
+    'StatementCache.h',
+]
+# SEE ABOVE NOTE!

storage/public/moz.build

@@ -1,47 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-XPIDL_SOURCES += [
-    'mozIStorageAggregateFunction.idl',
-    'mozIStorageAsyncConnection.idl',
-    'mozIStorageAsyncStatement.idl',
-    'mozIStorageBaseStatement.idl',
-    'mozIStorageBindingParams.idl',
-    'mozIStorageBindingParamsArray.idl',
-    'mozIStorageCompletionCallback.idl',
-    'mozIStorageConnection.idl',
-    'mozIStorageError.idl',
-    'mozIStorageFunction.idl',
-    'mozIStoragePendingStatement.idl',
-    'mozIStorageProgressHandler.idl',
-    'mozIStorageResultSet.idl',
-    'mozIStorageRow.idl',
-    'mozIStorageService.idl',
-    'mozIStorageStatement.idl',
-    'mozIStorageStatementCallback.idl',
-    'mozIStorageStatementParams.idl',
-    'mozIStorageStatementRow.idl',
-    'mozIStorageVacuumParticipant.idl',
-    'mozIStorageValueArray.idl',
-]
-
-XPIDL_MODULE = 'storage'
-
-EXPORTS += [
-    'mozStorageHelper.h',
-]
-
-EXPORTS.mozilla += [
-    'storage.h',
-]
-
-# NOTE When adding something to this list, you probably need to add it to the
-#      storage.h file too.
-EXPORTS.mozilla.storage += [
-    'StatementCache.h',
-]
-# SEE ABOVE NOTE!
-