Merge remote-tracking branch 'origin/redwood' into release

1 files changed, 6 insertions, 9 deletions

diff --git a/netwerk/wifi/moz.build b/netwerk/wifi/moz.build
index 28149cb78..6e351da00 100644
--- a/netwerk/wifi/moz.build
+++ b/netwerk/wifi/moz.build
@@ -12,16 +12,13 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'necko_wifi'
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'nsWifiAccessPoint.cpp',
-]
-
-UNIFIED_SOURCES += [
     'nsWifiMonitor.cpp',
 ]
 
 if CONFIG['OS_ARCH'] == 'Darwin':
-    UNIFIED_SOURCES += [
+    SOURCES += [
         'nsWifiScannerMac.cpp',
     ]
     SOURCES += [
@@ -32,23 +29,23 @@ if CONFIG['OS_ARCH'] == 'Darwin':
     # to accept the warnings when targeting the newer SDKs.
     SOURCES['osx_corewlan.mm'].flags += ['-Wno-error=objc-method-access']
 elif CONFIG['OS_ARCH'] in ('DragonFly', 'FreeBSD'):
-    UNIFIED_SOURCES += [
+    SOURCES += [
         'nsWifiScannerFreeBSD.cpp',
     ]
 elif CONFIG['OS_ARCH'] == 'WINNT':
-    UNIFIED_SOURCES += [
+    SOURCES += [
         'nsWifiScannerWin.cpp',
         'win_wifiScanner.cpp',
         'win_wlanLibrary.cpp',
     ]
 elif CONFIG['OS_ARCH'] == 'SunOS':
     CXXFLAGS += CONFIG['GLIB_CFLAGS']
-    UNIFIED_SOURCES += [
+    SOURCES += [
         'nsWifiScannerSolaris.cpp',
     ]
 
 if CONFIG['NECKO_WIFI_DBUS']:
-    UNIFIED_SOURCES += [
+    SOURCES += [
         'nsWifiScannerDBus.cpp',
     ]
     CXXFLAGS += ['-Wno-error=shadow']