From a610242b372d7c17d0858183dbfcfd8658a6d471 Mon Sep 17 00:00:00 2001
From: Thomas Zimmermann <tdz@users.sourceforge.net>
Date: Mon, 11 Jul 2016 15:16:56 +0200
Subject: [PATCH] Bug 1280600: Merge Android and b2g branches in build scripts
 where possible, r=glandium

B2g now has 'OS_TARGET' set to 'Android'. This patch merges Android
and Gonk branches in the build scripts where possible.

MozReview-Commit-ID: 9hKA0Gc62Xc
---
 b2g/components/moz.build           |  2 +-
 dom/media/systemservices/moz.build |  2 +-
 netwerk/base/moz.build             | 12 +-----------
 testing/mochitest/moz.build        |  2 +-
 toolkit/components/moz.build       |  2 +-
 5 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/b2g/components/moz.build b/b2g/components/moz.build
index 71e99513d31b9..ecfdf4533e222 100644
--- a/b2g/components/moz.build
+++ b/b2g/components/moz.build
@@ -29,7 +29,7 @@ EXTRA_COMPONENTS += [
     'WebappsUpdateTimer.js',
 ]
 
-if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk' and CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
+if CONFIG['OS_TARGET'] != 'Android':
     EXTRA_COMPONENTS += [
       'CommandLine.js',
       'OopCommandLine.js',
diff --git a/dom/media/systemservices/moz.build b/dom/media/systemservices/moz.build
index 229ca406fd4d0..91d39cbb4a53b 100644
--- a/dom/media/systemservices/moz.build
+++ b/dom/media/systemservices/moz.build
@@ -30,7 +30,7 @@ else:
     DEFINES['WEBRTC_POSIX'] = True
 
 
-if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gonk'):
+if CONFIG['OS_TARGET'] == 'Android':
     EXPORTS += [
         'OpenSLESProvider.h'
     ]
diff --git a/netwerk/base/moz.build b/netwerk/base/moz.build
index eb90c2349dbe2..b1500d80855f1 100644
--- a/netwerk/base/moz.build
+++ b/netwerk/base/moz.build
@@ -287,17 +287,7 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
         'NetworkInfoServiceCocoa.cpp',
         'nsNetworkInfoService.cpp',
     ]
-elif CONFIG['OS_TARGET'] == 'Linux':
-    SOURCES += [
-        'NetworkInfoServiceLinux.cpp',
-        'nsNetworkInfoService.cpp',
-    ]
-elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
-    SOURCES += [
-        'NetworkInfoServiceLinux.cpp',
-        'nsNetworkInfoService.cpp',
-    ]
-elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
+elif CONFIG['OS_ARCH'] == 'Linux':
     SOURCES += [
         'NetworkInfoServiceLinux.cpp',
         'nsNetworkInfoService.cpp',
diff --git a/testing/mochitest/moz.build b/testing/mochitest/moz.build
index 06eaef3752f11..05ba428f90a8b 100644
--- a/testing/mochitest/moz.build
+++ b/testing/mochitest/moz.build
@@ -19,7 +19,7 @@ USE_EXTENSION_MANIFEST = True
 
 FINAL_TARGET_PP_FILES += ['install.rdf']
 
-if CONFIG['MOZ_BUILD_APP'] != 'mobile/android' and CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':
+if CONFIG['OS_TARGET'] != 'Android':
     DEFINES['MOCHITEST_BOOTSTRAP'] = True
     FINAL_TARGET_FILES += ['bootstrap.js']
 
diff --git a/toolkit/components/moz.build b/toolkit/components/moz.build
index 9930c139ebee6..be97c6de3d5c0 100644
--- a/toolkit/components/moz.build
+++ b/toolkit/components/moz.build
@@ -97,7 +97,7 @@ if CONFIG['MOZ_URL_CLASSIFIER']:
 
 DIRS += ['captivedetect']
 
-if CONFIG['MOZ_WIDGET_TOOLKIT'] != "gonk" and CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
+if CONFIG['OS_TARGET'] != 'Android':
     DIRS += ['terminator']
 
 DIRS += ['build']