Bug 1357323 - Remove support for gonk in the build system. r=gps

Everything depending on the widget being gonk can go away, as well as everything depending on MOZ_AUDIO_CHANNEL_MANAGER, which was only defined on gonk builds under b2g/ (which goes away in bug 1357326). --HG-- extra : rebase_source : 9f0aeeb7eea8417fa4e06d662d566d67ecaf2a24
dothq · Apr 18, 2017 · 34e619d · 34e619d
1 parent 9231dfc
commit 34e619d
Show file tree

Hide file tree

Showing 44 changed files with 175 additions and 471 deletions.
diff --git a/addon-sdk/moz.build b/addon-sdk/moz.build
@@ -73,108 +73,107 @@ EXTRA_JS_MODULES.sdk.system += [
     'source/modules/system/Startup.js',
 ]
 
-if CONFIG['MOZ_WIDGET_TOOLKIT'] != "gonk":
-    EXTRA_JS_MODULES.commonjs.method.test += [
-        'source/lib/method/test/browser.js',
-        'source/lib/method/test/common.js',
-    ]
-
-    EXTRA_JS_MODULES.commonjs.sdk.deprecated += [
-        'source/lib/sdk/deprecated/api-utils.js',
-        'source/lib/sdk/deprecated/sync-worker.js',
-        'source/lib/sdk/deprecated/unit-test-finder.js',
-        'source/lib/sdk/deprecated/unit-test.js',
-        'source/lib/sdk/deprecated/window-utils.js',
-    ]
-
-    EXTRA_JS_MODULES.commonjs.sdk.frame += [
-        'source/lib/sdk/frame/hidden-frame.js',
-        'source/lib/sdk/frame/utils.js',
-    ]
-
-    EXTRA_JS_MODULES.commonjs.sdk.panel += [
-        'source/lib/sdk/panel/events.js',
-        'source/lib/sdk/panel/utils.js',
-    ]
-
-    EXTRA_JS_MODULES.commonjs.sdk.places += [
-        'source/lib/sdk/places/bookmarks.js',
-        'source/lib/sdk/places/contract.js',
-        'source/lib/sdk/places/events.js',
-        'source/lib/sdk/places/favicon.js',
-        'source/lib/sdk/places/history.js',
-        'source/lib/sdk/places/utils.js',
-    ]
-
-    EXTRA_JS_MODULES.commonjs.sdk.places.host += [
-        'source/lib/sdk/places/host/host-bookmarks.js',
-        'source/lib/sdk/places/host/host-query.js',
-        'source/lib/sdk/places/host/host-tags.js',
-    ]
-
-    EXTRA_JS_MODULES.commonjs.sdk.tabs += [
-        'source/lib/sdk/tabs/common.js',
-        'source/lib/sdk/tabs/events.js',
-        'source/lib/sdk/tabs/helpers.js',
-        'source/lib/sdk/tabs/namespace.js',
-        'source/lib/sdk/tabs/observer.js',
-        'source/lib/sdk/tabs/tab-fennec.js',
-        'source/lib/sdk/tabs/tab-firefox.js',
-        'source/lib/sdk/tabs/tab.js',
-        'source/lib/sdk/tabs/tabs-firefox.js',
-        'source/lib/sdk/tabs/utils.js',
-        'source/lib/sdk/tabs/worker.js',
-    ]
-
-    EXTRA_JS_MODULES.commonjs.sdk.test += [
-        'source/lib/sdk/test/assert.js',
-        'source/lib/sdk/test/harness.js',
-        'source/lib/sdk/test/httpd.js',
-        'source/lib/sdk/test/loader.js',
-        'source/lib/sdk/test/memory.js',
-        'source/lib/sdk/test/options.js',
-        'source/lib/sdk/test/runner.js',
-        'source/lib/sdk/test/utils.js',
-    ]
-
-    EXTRA_JS_MODULES.commonjs.sdk.ui += [
-        'source/lib/sdk/ui/component.js',
-        'source/lib/sdk/ui/frame.js',
-        'source/lib/sdk/ui/id.js',
-        'source/lib/sdk/ui/sidebar.js',
-        'source/lib/sdk/ui/state.js',
-        'source/lib/sdk/ui/toolbar.js',
-    ]
-
-    EXTRA_JS_MODULES.commonjs.sdk.ui.button += [
-        'source/lib/sdk/ui/button/action.js',
-        'source/lib/sdk/ui/button/contract.js',
-        'source/lib/sdk/ui/button/toggle.js',
-        'source/lib/sdk/ui/button/view.js',
-    ]
-
-    EXTRA_JS_MODULES.commonjs.sdk.ui.sidebar += [
-        'source/lib/sdk/ui/sidebar/actions.js',
-        'source/lib/sdk/ui/sidebar/contract.js',
-        'source/lib/sdk/ui/sidebar/namespace.js',
-        'source/lib/sdk/ui/sidebar/utils.js',
-        'source/lib/sdk/ui/sidebar/view.js',
-    ]
-
-    EXTRA_JS_MODULES.commonjs.sdk.window += [
-        'source/lib/sdk/window/browser.js',
-        'source/lib/sdk/window/events.js',
-        'source/lib/sdk/window/helpers.js',
-        'source/lib/sdk/window/namespace.js',
-        'source/lib/sdk/window/utils.js',
-    ]
-
-    EXTRA_JS_MODULES.commonjs.sdk.windows += [
-        'source/lib/sdk/windows/fennec.js',
-        'source/lib/sdk/windows/firefox.js',
-        'source/lib/sdk/windows/observer.js',
-        'source/lib/sdk/windows/tabs-fennec.js',
-    ]
+EXTRA_JS_MODULES.commonjs.method.test += [
+    'source/lib/method/test/browser.js',
+    'source/lib/method/test/common.js',
+]
+
+EXTRA_JS_MODULES.commonjs.sdk.deprecated += [
+    'source/lib/sdk/deprecated/api-utils.js',
+    'source/lib/sdk/deprecated/sync-worker.js',
+    'source/lib/sdk/deprecated/unit-test-finder.js',
+    'source/lib/sdk/deprecated/unit-test.js',
+    'source/lib/sdk/deprecated/window-utils.js',
+]
+
+EXTRA_JS_MODULES.commonjs.sdk.frame += [
+    'source/lib/sdk/frame/hidden-frame.js',
+    'source/lib/sdk/frame/utils.js',
+]
+
+EXTRA_JS_MODULES.commonjs.sdk.panel += [
+    'source/lib/sdk/panel/events.js',
+    'source/lib/sdk/panel/utils.js',
+]
+
+EXTRA_JS_MODULES.commonjs.sdk.places += [
+    'source/lib/sdk/places/bookmarks.js',
+    'source/lib/sdk/places/contract.js',
+    'source/lib/sdk/places/events.js',
+    'source/lib/sdk/places/favicon.js',
+    'source/lib/sdk/places/history.js',
+    'source/lib/sdk/places/utils.js',
+]
+
+EXTRA_JS_MODULES.commonjs.sdk.places.host += [
+    'source/lib/sdk/places/host/host-bookmarks.js',
+    'source/lib/sdk/places/host/host-query.js',
+    'source/lib/sdk/places/host/host-tags.js',
+]
+
+EXTRA_JS_MODULES.commonjs.sdk.tabs += [
+    'source/lib/sdk/tabs/common.js',
+    'source/lib/sdk/tabs/events.js',
+    'source/lib/sdk/tabs/helpers.js',
+    'source/lib/sdk/tabs/namespace.js',
+    'source/lib/sdk/tabs/observer.js',
+    'source/lib/sdk/tabs/tab-fennec.js',
+    'source/lib/sdk/tabs/tab-firefox.js',
+    'source/lib/sdk/tabs/tab.js',
+    'source/lib/sdk/tabs/tabs-firefox.js',
+    'source/lib/sdk/tabs/utils.js',
+    'source/lib/sdk/tabs/worker.js',
+]
+
+EXTRA_JS_MODULES.commonjs.sdk.test += [
+    'source/lib/sdk/test/assert.js',
+    'source/lib/sdk/test/harness.js',
+    'source/lib/sdk/test/httpd.js',
+    'source/lib/sdk/test/loader.js',
+    'source/lib/sdk/test/memory.js',
+    'source/lib/sdk/test/options.js',
+    'source/lib/sdk/test/runner.js',
+    'source/lib/sdk/test/utils.js',
+]
+
+EXTRA_JS_MODULES.commonjs.sdk.ui += [
+    'source/lib/sdk/ui/component.js',
+    'source/lib/sdk/ui/frame.js',
+    'source/lib/sdk/ui/id.js',
+    'source/lib/sdk/ui/sidebar.js',
+    'source/lib/sdk/ui/state.js',
+    'source/lib/sdk/ui/toolbar.js',
+]
+
+EXTRA_JS_MODULES.commonjs.sdk.ui.button += [
+    'source/lib/sdk/ui/button/action.js',
+    'source/lib/sdk/ui/button/contract.js',
+    'source/lib/sdk/ui/button/toggle.js',
+    'source/lib/sdk/ui/button/view.js',
+]
+
+EXTRA_JS_MODULES.commonjs.sdk.ui.sidebar += [
+    'source/lib/sdk/ui/sidebar/actions.js',
+    'source/lib/sdk/ui/sidebar/contract.js',
+    'source/lib/sdk/ui/sidebar/namespace.js',
+    'source/lib/sdk/ui/sidebar/utils.js',
+    'source/lib/sdk/ui/sidebar/view.js',
+]
+
+EXTRA_JS_MODULES.commonjs.sdk.window += [
+    'source/lib/sdk/window/browser.js',
+    'source/lib/sdk/window/events.js',
+    'source/lib/sdk/window/helpers.js',
+    'source/lib/sdk/window/namespace.js',
+    'source/lib/sdk/window/utils.js',
+]
+
+EXTRA_JS_MODULES.commonjs.sdk.windows += [
+    'source/lib/sdk/windows/fennec.js',
+    'source/lib/sdk/windows/firefox.js',
+    'source/lib/sdk/windows/observer.js',
+    'source/lib/sdk/windows/tabs-fennec.js',
+]
 
 EXTRA_JS_MODULES.commonjs += [
     'source/lib/index.js',
@@ -542,4 +541,4 @@ EXTRA_JS_MODULES.commonjs.toolkit += [
 ]
 
 with Files("**"):
-    BUG_COMPONENT = ("Add-on SDK", "General")
+    BUG_COMPONENT = ("Add-on SDK", "General")
diff --git a/build/gyp.mozbuild b/build/gyp.mozbuild
@@ -77,18 +77,11 @@ gyp_vars.update({
 })
 
 if os == 'Android':
-    if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
-        gyp_vars['build_with_gonk'] = 1
-        gyp_vars['moz_widget_toolkit_gonk'] = 1
-        gyp_vars['opus_complexity'] = 1
-        if int(CONFIG['ANDROID_VERSION']) >= 18:
-          gyp_vars['moz_webrtc_omx'] = 1
-    else:
-        gyp_vars.update(
-            gtest_target_type='executable',
-            moz_webrtc_mediacodec=1,
-            android_toolchain=CONFIG.get('ANDROID_TOOLCHAIN', ''),
-        )
+    gyp_vars.update(
+        gtest_target_type='executable',
+        moz_webrtc_mediacodec=1,
+        android_toolchain=CONFIG.get('ANDROID_TOOLCHAIN', ''),
+    )
 
 if CONFIG['ARM_ARCH']:
     if int(CONFIG['ARM_ARCH']) < 7:

diff --git a/build/gyp_base.mozbuild b/build/gyp_base.mozbuild
@@ -16,7 +16,7 @@ if os == 'WINNT':
 
 flavors = {
     'WINNT': 'win',
-    'Android': 'linux' if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk' else 'android',
+    'Android': 'android',
     'Linux': 'linux',
     'Darwin': 'mac' if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa' else 'ios',
     'SunOS': 'solaris',

diff --git a/dom/base/moz.build b/dom/base/moz.build
@@ -459,11 +459,6 @@ LOCAL_INCLUDES += [
     '/xpcom/ds',
 ]
 
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
-    LOCAL_INCLUDES += [
-        '../system/gonk',
-    ]
-
 if CONFIG['MOZ_WEBRTC']:
     LOCAL_INCLUDES += [
         '/netwerk/sctp/datachannel',

diff --git a/dom/bindings/moz.build b/dom/bindings/moz.build
@@ -140,11 +140,6 @@ if CONFIG['MOZ_DEBUG']:
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
-if CONFIG['MOZ_AUDIO_CHANNEL_MANAGER']:
-    LOCAL_INCLUDES += [
-        '/dom/system/gonk',
-    ]
-
 FINAL_LIBRARY = 'xul'
 
 SPHINX_TREES['webidl'] = 'docs'

diff --git a/dom/events/moz.build b/dom/events/moz.build
@@ -153,10 +153,5 @@ LOCAL_INCLUDES += [
     '/layout/xul/tree/',
 ]
 
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
-    LOCAL_INCLUDES += [
-        '/dom/wifi',
-    ]
-
 if CONFIG['GNU_CXX']:
     CXXFLAGS += ['-Wno-error=shadow']
diff --git a/dom/geolocation/moz.build b/dom/geolocation/moz.build
@@ -33,10 +33,6 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
     LOCAL_INCLUDES += [
         '/dom/system/android',
     ]
-elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
-    LOCAL_INCLUDES += [
-        '/dom/system/gonk',
-    ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     LOCAL_INCLUDES += [
         '/dom/system/mac',

diff --git a/dom/ipc/moz.build b/dom/ipc/moz.build
@@ -157,7 +157,7 @@ if CONFIG['OS_ARCH'] != 'WINNT':
 
 DEFINES['BIN_SUFFIX'] = '"%s"' % CONFIG['BIN_SUFFIX']
 
-if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gtk2', 'gonk'):
+if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gtk2'):
     DEFINES['MOZ_ENABLE_FREETYPE'] = True
 
 if CONFIG['MOZ_TOOLKIT_SEARCH']:

diff --git a/dom/media/encoder/moz.build b/dom/media/encoder/moz.build
@@ -7,9 +7,6 @@
 with Files('*'):
     BUG_COMPONENT = ('Core', 'Audio/Video: Recording')
 
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
-    DIRS += ['fmp4_muxer']
-
 EXPORTS += [
     'ContainerWriter.h',
     'EncodedFrameContainer.h',
@@ -37,16 +34,6 @@ FINAL_LIBRARY = 'xul'
 # These includes are from Android JB, for use of MediaCodec.
 LOCAL_INCLUDES += ['/ipc/chromium/src']
 
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk' and CONFIG['ANDROID_VERSION'] > '15':
-    LOCAL_INCLUDES += [
-        '%' + '%s/%s' % (CONFIG['ANDROID_SOURCE'], d) for d in [
-            'frameworks/av/include/media',
-            'frameworks/native/include',
-            'frameworks/native/opengl/include',
-        ]
-
-    ]
-
 include('/ipc/chromium/chromium-config.mozbuild')
 
 # Suppress some GCC warnings being treated as errors:

diff --git a/dom/media/platforms/omx/moz.build b/dom/media/platforms/omx/moz.build
@@ -21,29 +21,6 @@ LOCAL_INCLUDES += [
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk' and (CONFIG['ANDROID_VERSION'] == '19' or CONFIG['ANDROID_VERSION'] == '20'):
-    # Suppress some GCC/clang warnings being treated as errors:
-    #  - about attributes on forward declarations for types that are already
-    #    defined, which complains about an important MOZ_EXPORT for android::AString
-    #  - about multi-character constants which are used in codec-related code
-    if CONFIG['GNU_CC'] or CONFIG['CLANG_CL']:
-        CXXFLAGS += [
-          '-Wno-error=attributes',
-          '-Wno-error=multichar'
-        ]
-    CXXFLAGS += [
-        '-I%s/%s' % (CONFIG['ANDROID_SOURCE'], d) for d in [
-            'frameworks/base/include/binder',
-            'frameworks/base/include/utils',
-        ]
-    ]
-    UNIFIED_SOURCES += [
-        'GonkOmxPlatformLayer.cpp',
-    ]
-    EXTRA_DSO_LDOPTS += [
-        '-libbinder',
-    ]
-
 FINAL_LIBRARY = 'xul'
 
 if CONFIG['GNU_CXX']:

diff --git a/dom/media/systemservices/moz.build b/dom/media/systemservices/moz.build
@@ -49,16 +49,6 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
   UNIFIED_SOURCES += ['OSXRunLoopSingleton.cpp']
   EXPORTS += ['OSXRunLoopSingleton.h']
 
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
-    if CONFIG['ANDROID_VERSION'] >= '17':
-        LOCAL_INCLUDES += [
-            '%' + '%s/frameworks/wilhelm/include' % CONFIG['ANDROID_SOURCE'],
-        ]
-    else:
-        LOCAL_INCLUDES += [
-            '%' + '%s/system/media/wilhelm/include' % CONFIG['ANDROID_SOURCE'],
-        ]
-
 if CONFIG['_MSC_VER']:
     DEFINES['__PRETTY_FUNCTION__'] = '__FUNCSIG__'
 

diff --git a/dom/network/interfaces/moz.build b/dom/network/interfaces/moz.build
@@ -10,9 +10,4 @@ XPIDL_SOURCES += [
     'nsIUDPSocketChild.idl',
 ]
 
-if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
-    XPIDL_SOURCES += [
-        'nsIEthernetManager.idl',
-    ]
-
 XPIDL_MODULE = 'dom_network'