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

--HG--
rename : dom/wappush/src/gonk/CpPduHelper.jsm => dom/wappush/gonk/CpPduHelper.jsm
rename : dom/wappush/src/gonk/SiPduHelper.jsm => dom/wappush/gonk/SiPduHelper.jsm
rename : dom/wappush/src/gonk/SlPduHelper.jsm => dom/wappush/gonk/SlPduHelper.jsm
rename : dom/wappush/src/gonk/WapPushManager.js => dom/wappush/gonk/WapPushManager.js
rename : dom/wappush/src/gonk/WbxmlPduHelper.jsm => dom/wappush/gonk/WbxmlPduHelper.jsm

dom/wappush/moz.build

@@ -3,7 +3,14 @@
 # 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 += ['src']
-
 if CONFIG['ENABLE_TESTS']:
     XPCSHELL_TESTS_MANIFESTS += ['tests/xpcshell.ini']
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk' and CONFIG['MOZ_B2G_RIL']:
+    EXTRA_JS_MODULES += [
+        'gonk/CpPduHelper.jsm',
+        'gonk/SiPduHelper.jsm',
+        'gonk/SlPduHelper.jsm',
+        'gonk/WapPushManager.js',
+        'gonk/WbxmlPduHelper.jsm'
+    ]

dom/wappush/src/moz.build

@@ -1,14 +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/.
-
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk' and CONFIG['MOZ_B2G_RIL']:
-    EXTRA_JS_MODULES += [
-        'gonk/CpPduHelper.jsm',
-        'gonk/SiPduHelper.jsm',
-        'gonk/SlPduHelper.jsm',
-        'gonk/WapPushManager.js',
-        'gonk/WbxmlPduHelper.jsm'
-    ]