Bug 920551 - 2.g/2: fix WAP Push. r=hsinyi,khuey

dom/moz.build

@@ -72,7 +72,6 @@ PARALLEL_DIRS += [
     'camera',
     'audiochannel',
     'promise',
-    'wappush',
     'telephony',
     'inputmethod',
     'webidl',
@@ -87,6 +86,7 @@ if CONFIG['MOZ_B2G_RIL']:
         'icc',
         'cellbroadcast',
         'voicemail',
+        'wappush',
     ]
 
 if CONFIG['MOZ_PAY']:

dom/wappush/moz.build

@@ -5,5 +5,5 @@
 
 PARALLEL_DIRS += ['interfaces', 'src']
 
-if CONFIG['MOZ_B2G_RIL'] and CONFIG['ENABLE_TESTS']:
+if CONFIG['ENABLE_TESTS']:
     XPCSHELL_TESTS_MANIFESTS += ['tests/xpcshell.ini']

dom/wappush/src/moz.build

@@ -4,7 +4,7 @@
 # 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',