Bug 920551 - 2.g/2: fix WAP Push. r=hsinyi,khuey
authorVicamo Yang <vyang@mozilla.com>
Tue, 29 Oct 2013 16:12:43 +0800
changeset 152744 57f3ed254a9a6e3f6025340ea2b7ab697823caf8
parent 152743 f44498c4f66efeb36be790ca3adfdd94049e41df
child 152745 4b3760220ba2f73fde96483134658051a6c27930
push id35628
push userryanvm@gmail.com
push dateThu, 31 Oct 2013 02:42:21 +0000
treeherdermozilla-inbound@888fa8b299ef [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewershsinyi, khuey
bugs920551
milestone27.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 920551 - 2.g/2: fix WAP Push. r=hsinyi,khuey
dom/moz.build
dom/wappush/moz.build
dom/wappush/src/moz.build
--- a/dom/moz.build
+++ b/dom/moz.build
@@ -67,31 +67,31 @@ PARALLEL_DIRS += [
     'indexedDB',
     'system',
     'ipc',
     'identity',
     'workers',
     'camera',
     'audiochannel',
     'promise',
-    'wappush',
     'telephony',
     'inputmethod',
     'webidl',
 ]
 
 if CONFIG['OS_ARCH'] == 'WINNT':
     PARALLEL_DIRS += ['plugins/ipc/hangui']
 
 if CONFIG['MOZ_B2G_RIL']:
     PARALLEL_DIRS += [
         'wifi',
         'icc',
         'cellbroadcast',
         'voicemail',
+        'wappush',
     ]
 
 if CONFIG['MOZ_PAY']:
     PARALLEL_DIRS += ['payment']
 
 if CONFIG['MOZ_GAMEPAD']:
     PARALLEL_DIRS += ['gamepad']
 
--- a/dom/wappush/moz.build
+++ b/dom/wappush/moz.build
@@ -1,9 +1,9 @@
 # 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/.
 
 PARALLEL_DIRS += ['interfaces', 'src']
 
-if CONFIG['MOZ_B2G_RIL'] and CONFIG['ENABLE_TESTS']:
+if CONFIG['ENABLE_TESTS']:
     XPCSHELL_TESTS_MANIFESTS += ['tests/xpcshell.ini']
--- a/dom/wappush/src/moz.build
+++ b/dom/wappush/src/moz.build
@@ -1,14 +1,14 @@
 # -*- 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_B2G_RIL']:
+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'
     ]