Bug 1058101 - Flatten dom/wappush/src/ into parent directory. r=mccr8
authorBirunthan Mohanathas <birunthan@mohanathas.com>
Wed, 27 Aug 2014 10:13:52 -0700
changeset 224375 1db55321cc1ab823055e79f8b1c333c1af1bd508
parent 224374 e013edc6ea0dff6cc1c2bbca48e6971ed560e6d6
child 224376 eecdde427cb7922c0c726586983f6d786f2413f0
push id3979
push userraliiev@mozilla.com
push dateMon, 13 Oct 2014 16:35:44 +0000
treeherdermozilla-beta@30f2cc610691 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmccr8
bugs1058101
milestone34.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1058101 - Flatten dom/wappush/src/ into parent directory. r=mccr8
dom/wappush/gonk/CpPduHelper.jsm
dom/wappush/gonk/SiPduHelper.jsm
dom/wappush/gonk/SlPduHelper.jsm
dom/wappush/gonk/WapPushManager.js
dom/wappush/gonk/WbxmlPduHelper.jsm
dom/wappush/moz.build
dom/wappush/src/gonk/CpPduHelper.jsm
dom/wappush/src/gonk/SiPduHelper.jsm
dom/wappush/src/gonk/SlPduHelper.jsm
dom/wappush/src/gonk/WapPushManager.js
dom/wappush/src/gonk/WbxmlPduHelper.jsm
dom/wappush/src/moz.build
rename from dom/wappush/src/gonk/CpPduHelper.jsm
rename to dom/wappush/gonk/CpPduHelper.jsm
rename from dom/wappush/src/gonk/SiPduHelper.jsm
rename to dom/wappush/gonk/SiPduHelper.jsm
rename from dom/wappush/src/gonk/SlPduHelper.jsm
rename to dom/wappush/gonk/SlPduHelper.jsm
rename from dom/wappush/src/gonk/WapPushManager.js
rename to dom/wappush/gonk/WapPushManager.js
rename from dom/wappush/src/gonk/WbxmlPduHelper.jsm
rename to dom/wappush/gonk/WbxmlPduHelper.jsm
--- a/dom/wappush/moz.build
+++ b/dom/wappush/moz.build
@@ -1,9 +1,16 @@
 # 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/.
 
-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'
+    ]
deleted file mode 100644
--- a/dom/wappush/src/moz.build
+++ /dev/null
@@ -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'
-    ]