Bug 1058101 - Flatten dom/activities/src/ into parent directory. r=mccr8

--HG--
rename : dom/activities/src/Activities.manifest => dom/activities/Activities.manifest
rename : dom/activities/src/ActivitiesService.jsm => dom/activities/ActivitiesService.jsm
rename : dom/activities/src/ActivitiesServiceFilter.jsm => dom/activities/ActivitiesServiceFilter.jsm
rename : dom/activities/src/Activity.cpp => dom/activities/Activity.cpp
rename : dom/activities/src/Activity.h => dom/activities/Activity.h
rename : dom/activities/src/ActivityMessageConfigurator.js => dom/activities/ActivityMessageConfigurator.js
rename : dom/activities/src/ActivityProxy.js => dom/activities/ActivityProxy.js
rename : dom/activities/src/ActivityRequestHandler.js => dom/activities/ActivityRequestHandler.js
rename : dom/activities/src/ActivityWrapper.js => dom/activities/ActivityWrapper.js

dom/activities/moz.build

@@ -4,6 +4,35 @@
 # 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 += ['interfaces', 'src']
+DIRS += ['interfaces']
 
 XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini']
+
+EXPORTS.mozilla.dom += [
+    'Activity.h',
+]
+
+SOURCES += [
+    'Activity.cpp',
+]
+
+EXTRA_COMPONENTS += [
+    'Activities.manifest',
+    'ActivityMessageConfigurator.js',
+    'ActivityProxy.js',
+    'ActivityRequestHandler.js',
+    'ActivityWrapper.js',
+]
+
+EXTRA_JS_MODULES += [
+    'ActivitiesService.jsm',
+    'ActivitiesServiceFilter.jsm',
+]
+
+FAIL_ON_WARNINGS = True
+
+LOCAL_INCLUDES += [
+    '/dom/base',
+]
+
+FINAL_LIBRARY = 'xul'

dom/activities/src/moz.build

@@ -1,34 +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.mozilla.dom += [
-    'Activity.h',
-]
-
-SOURCES += [
-    'Activity.cpp',
-]
-
-EXTRA_COMPONENTS += [
-    'Activities.manifest',
-    'ActivityMessageConfigurator.js',
-    'ActivityProxy.js',
-    'ActivityRequestHandler.js',
-    'ActivityWrapper.js',
-]
-
-EXTRA_JS_MODULES += [
-    'ActivitiesService.jsm',
-    'ActivitiesServiceFilter.jsm',
-]
-
-FAIL_ON_WARNINGS = True
-
-LOCAL_INCLUDES += [
-    '/dom/base',
-]
-
-FINAL_LIBRARY = 'xul'