Bug 920551 - 2.g/2: fix WAP Push. r=hsinyi,khuey, a=koi+
☠☠ backed out by 9535f227ec80 ☠ ☠
authorVicamo Yang <vyang@mozilla.com>
Thu, 31 Oct 2013 21:08:19 +0800
changeset 166330 7223b4bc24f79d8150d29813331f1a04a4f75d43
parent 166329 89e114a843965281d9def56b2614886da624427e
child 166331 fdc1b9ae7b8c6467898053428291c2d37e5d2eb1
push id3066
push userakeybl@mozilla.com
push dateMon, 09 Dec 2013 19:58:46 +0000
treeherdermozilla-beta@a31a0dce83aa [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewershsinyi, khuey, koi
bugs920551
milestone27.0a2
Bug 920551 - 2.g/2: fix WAP Push. r=hsinyi,khuey, a=koi+
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'
     ]