Bug 1047878 - Flatten profile/dirserviceprovider/{public,src}/ directories. r=bsmedberg

--HG--
rename : profile/dirserviceprovider/src/nsProfileDirServiceProvider.cpp => profile/dirserviceprovider/nsProfileDirServiceProvider.cpp
rename : profile/dirserviceprovider/public/nsProfileDirServiceProvider.h => profile/dirserviceprovider/nsProfileDirServiceProvider.h
rename : profile/dirserviceprovider/src/nsProfileLock.cpp => profile/dirserviceprovider/nsProfileLock.cpp
rename : profile/dirserviceprovider/src/nsProfileLock.h => profile/dirserviceprovider/nsProfileLock.h
rename : profile/dirserviceprovider/src/nsProfileStringTypes.h => profile/dirserviceprovider/nsProfileStringTypes.h

profile/dirserviceprovider/moz.build

@@ -4,5 +4,18 @@
 # 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']
+EXPORTS += [
+    'nsProfileDirServiceProvider.h',
+]
 
+UNIFIED_SOURCES += ['nsProfileDirServiceProvider.cpp']
+if CONFIG['MOZ_PROFILELOCKING']:
+    UNIFIED_SOURCES += ['nsProfileLock.cpp']
+
+LIBRARY_NAME = 'profdirserviceprovidersa_s'
+
+FORCE_STATIC_LIB = True
+
+DEFINES['XPCOM_GLUE'] = 1
+
+DISABLE_STL_WRAPPING = True

profile/dirserviceprovider/public/moz.build

@@ -1,10 +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/.
-
-EXPORTS += [
-    'nsProfileDirServiceProvider.h',
-]
-

profile/dirserviceprovider/src/moz.build

@@ -1,17 +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/.
-
-UNIFIED_SOURCES += ['nsProfileDirServiceProvider.cpp']
-if CONFIG['MOZ_PROFILELOCKING']:
-    UNIFIED_SOURCES += ['nsProfileLock.cpp']
-
-LIBRARY_NAME = 'profdirserviceprovidersa_s'
-
-FORCE_STATIC_LIB = True
-
-DEFINES['XPCOM_GLUE'] = 1
-
-DISABLE_STL_WRAPPING = True

toolkit/profile/moz.build

@@ -14,7 +14,7 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'toolkitprofile'
 
-UNIFIED_SOURCES += [ TOPSRCDIR + '/profile/dirserviceprovider/src/nsProfileLock.cpp' ]
+UNIFIED_SOURCES += [ TOPSRCDIR + '/profile/dirserviceprovider/nsProfileLock.cpp' ]
 
 UNIFIED_SOURCES += [
     'nsToolkitProfileService.cpp'
@@ -22,7 +22,7 @@ UNIFIED_SOURCES += [
 
 LOCAL_INCLUDES += [
     '../xre',
-    '/profile/dirserviceprovider/src',
+    '/profile/dirserviceprovider',
 ]
 
 FAIL_ON_WARNINGS = True