From 34e619d1c13a08a783935e7dbef643911e92dbf8 Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Tue, 18 Apr 2017 16:56:09 +0900 Subject: [PATCH] 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 --- addon-sdk/moz.build | 205 +++++++++--------- build/gyp.mozbuild | 17 +- build/gyp_base.mozbuild | 2 +- dom/base/moz.build | 5 - dom/bindings/moz.build | 5 - dom/events/moz.build | 5 - dom/geolocation/moz.build | 4 - dom/ipc/moz.build | 2 +- dom/media/encoder/moz.build | 13 -- dom/media/platforms/omx/moz.build | 23 -- dom/media/systemservices/moz.build | 10 - dom/network/interfaces/moz.build | 5 - dom/network/moz.build | 12 - dom/secureelement/moz.build | 28 --- dom/system/moz.build | 3 - dom/webidl/moz.build | 7 +- hal/moz.build | 51 +---- ipc/app/moz.build | 6 - ipc/chromium/moz.build | 2 - ipc/moz.build | 10 +- layout/build/moz.build | 4 - media/libcubeb/src/moz.build | 21 +- media/mtransport/test/moz.build | 2 +- .../lib/ics/libstagefright/moz.build | 15 +- media/omx-plugin/lib/ics/libutils/moz.build | 7 +- .../lib/ics/libvideoeditorplayer/moz.build | 7 +- media/omx-plugin/moz.build | 33 +-- mozglue/build/moz.build | 5 - netwerk/base/moz.build | 5 - netwerk/dns/mdns/libmdns/moz.build | 10 +- netwerk/wifi/moz.build | 10 +- .../mozbuild/mozbuild/backend/cpp_eclipse.py | 25 +-- python/mozbuild/mozbuild/base.py | 7 - python/mozbuild/mozbuild/mozinfo.py | 2 +- python/mozbuild/mozbuild/test/test_testing.py | 4 +- security/sandbox/linux/broker/moz.build | 4 - .../marionette_harness/tests/webapi-tests.ini | 1 - .../breakpad-client/linux/moz.build | 3 - toolkit/library/moz.build | 34 --- toolkit/moz.configure | 19 +- tools/profiler/moz.build | 3 - uriloader/exthandler/moz.build | 2 +- widget/moz.build | 6 +- xpcom/threads/moz.build | 2 - 44 files changed, 175 insertions(+), 471 deletions(-) diff --git a/addon-sdk/moz.build b/addon-sdk/moz.build index 9858bc40a87a6..73a3ee8663c09 100644 --- 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") \ No newline at end of file + BUG_COMPONENT = ("Add-on SDK", "General") diff --git a/build/gyp.mozbuild b/build/gyp.mozbuild index 5a7ec56a774b2..2673a2f51c752 100644 --- 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 index bbdaa0c58339b..9344cc4e7f6fe 100644 --- 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 index f177c00bc01ba..cc41636b3fbef 100644 --- 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 index eb038f19ee59f..2e87e1efa1005 100644 --- 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 index 73317a87ea606..875a8b33d86e4 100644 --- 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 index 8914b9c3913e4..be4808dd8f82e 100644 --- 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 index b878a8a70711a..cf865fec82c1c 100644 --- 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 index 67b2b56855df3..44d85b9755df6 100644 --- 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 index 9f641d9379fe0..661e280e03a71 100644 --- 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 index 7291ff0d8eb6e..072e39ba46ca2 100644 --- 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 index e4e1230203843..ad2e56bd6b273 100644 --- 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' diff --git a/dom/network/moz.build b/dom/network/moz.build index 4fc00698c2dd5..cc6ad275c20bc 100644 --- a/dom/network/moz.build +++ b/dom/network/moz.build @@ -45,18 +45,6 @@ UNIFIED_SOURCES += [ 'UDPSocketParent.cpp', ] -if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': - EXTRA_COMPONENTS += [ - 'EthernetManager.js', - 'EthernetManager.manifest', - ] - EXPORTS.mozilla.dom.network += [ - 'NetUtils.h', - ] - UNIFIED_SOURCES += [ - 'NetUtils.cpp', - ] - IPDL_SOURCES += [ 'PTCPServerSocket.ipdl', 'PTCPSocket.ipdl', diff --git a/dom/secureelement/moz.build b/dom/secureelement/moz.build index 6ce280c491f40..6fddb29bc0547 100644 --- a/dom/secureelement/moz.build +++ b/dom/secureelement/moz.build @@ -14,31 +14,3 @@ if CONFIG['MOZ_SECUREELEMENT']: 'DOMSecureElement.js', 'DOMSecureElement.manifest', ] - -if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk' and CONFIG['MOZ_SECUREELEMENT']: - EXTRA_COMPONENTS += [ - 'gonk/ACEService.js', - 'gonk/ACEService.manifest', - 'gonk/GPAccessRulesManager.js', - 'gonk/GPAccessRulesManager.manifest', - 'gonk/SecureElement.js', - 'gonk/SecureElement.manifest', - ] - XPIDL_MODULE = 'dom_secureelement' - XPIDL_SOURCES += [ - 'gonk/nsIAccessControlEnforcer.idl', - 'gonk/nsIAccessRulesManager.idl', - 'gonk/nsISecureElementConnector.idl', - ] - EXTRA_JS_MODULES += [ - 'gonk/gp_consts.js', - 'gonk/se_consts.js', - 'SEUtils.jsm' - ] - XPCSHELL_TESTS_MANIFESTS += [ - 'tests/unit/xpcshell.ini' - ] - -include('/ipc/chromium/chromium-config.mozbuild') - -FINAL_LIBRARY = 'xul' diff --git a/dom/system/moz.build b/dom/system/moz.build index ff035504e3909..e8a835bda2498 100644 --- a/dom/system/moz.build +++ b/dom/system/moz.build @@ -5,7 +5,6 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # This picks up *hapticfeedback* which is graveyard -# This picks up gonk/* which is also not supported? with Files("**"): BUG_COMPONENT = ("Core", "DOM") @@ -47,8 +46,6 @@ elif toolkit == 'cocoa': DIRS += ['mac'] elif toolkit == 'android': DIRS += ['android'] -elif toolkit == 'gonk': - DIRS += ['gonk'] elif toolkit in ('gtk2', 'gtk3'): DIRS += ['linux'] diff --git a/dom/webidl/moz.build b/dom/webidl/moz.build index a58614cc30d41..ccbbb31ae7bac 100644 --- a/dom/webidl/moz.build +++ b/dom/webidl/moz.build @@ -1048,10 +1048,9 @@ if CONFIG['MOZ_SECUREELEMENT']: 'SecureElementManager.webidl', ] -if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk': - WEBIDL_FILES += [ - 'InstallTrigger.webidl', - ] +WEBIDL_FILES += [ + 'InstallTrigger.webidl', +] if CONFIG['FUZZING']: WEBIDL_FILES += [ diff --git a/hal/moz.build b/hal/moz.build index 7710ce58936bf..1360c374e7ccf 100644 --- a/hal/moz.build +++ b/hal/moz.build @@ -51,24 +51,6 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android': SOURCES += [ 'android/AndroidHal.cpp', ] -elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': - UNIFIED_SOURCES += [ - 'gonk/GonkDiskSpaceWatcher.cpp', - 'gonk/GonkSensor.cpp', - 'gonk/GonkSensorsHelpers.cpp', - 'gonk/GonkSensorsInterface.cpp', - 'gonk/GonkSensorsPollInterface.cpp', - 'gonk/GonkSensorsRegistryInterface.cpp', - 'gonk/GonkSwitch.cpp', - 'gonk/SystemService.cpp', - 'gonk/UeventPoller.cpp', - 'linux/LinuxMemory.cpp', - 'linux/LinuxPower.cpp', - ] - # GonkHal.cpp cannot be built in unified mode because it relies on HalImpl.h. - SOURCES += [ - 'gonk/GonkHal.cpp', - ] elif CONFIG['OS_TARGET'] == 'Linux': UNIFIED_SOURCES += [ 'fallback/FallbackScreenConfiguration.cpp', @@ -132,18 +114,17 @@ else: ] # Fallbacks for backends implemented on Gonk only. -if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk': - UNIFIED_SOURCES += [ - 'fallback/FallbackDiskSpaceWatcher.cpp', - 'fallback/FallbackFactoryReset.cpp', - 'fallback/FallbackProcessPriority.cpp', - 'fallback/FallbackScreenPower.cpp', - 'fallback/FallbackSwitch.cpp', - 'fallback/FallbackSystemService.cpp', - 'fallback/FallbackThreadPriority.cpp', - 'fallback/FallbackTime.cpp', - 'fallback/FallbackWakeLocks.cpp', - ] +UNIFIED_SOURCES += [ + 'fallback/FallbackDiskSpaceWatcher.cpp', + 'fallback/FallbackFactoryReset.cpp', + 'fallback/FallbackProcessPriority.cpp', + 'fallback/FallbackScreenPower.cpp', + 'fallback/FallbackSwitch.cpp', + 'fallback/FallbackSystemService.cpp', + 'fallback/FallbackThreadPriority.cpp', + 'fallback/FallbackTime.cpp', + 'fallback/FallbackWakeLocks.cpp', +] # Fallbacks for backends implemented on Android only. if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android': @@ -169,16 +150,6 @@ LOCAL_INCLUDES += [ '/dom/base', ] -if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': - # So that we can call nsScreenManagerGonk::GetConfiguration(). - LOCAL_INCLUDES += [ - '/widget', - '/widget/gonk', - ] - -if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': - LOCAL_INCLUDES += ['%' + '%s/hardware/libhardware_legacy/include' % CONFIG['ANDROID_SOURCE']] - CFLAGS += CONFIG['GLIB_CFLAGS'] CFLAGS += CONFIG['MOZ_DBUS_GLIB_CFLAGS'] CXXFLAGS += CONFIG['GLIB_CFLAGS'] diff --git a/ipc/app/moz.build b/ipc/app/moz.build index 55175a18727f9..06ce49291e705 100644 --- a/ipc/app/moz.build +++ b/ipc/app/moz.build @@ -81,12 +81,6 @@ if CONFIG['_MSC_VER']: if CONFIG['OS_ARCH'] == 'WINNT' and not CONFIG['GNU_CC']: LDFLAGS += ['/HEAP:0x40000'] -if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': - OS_LIBS += [ - 'binder', - 'utils', - ] - if CONFIG['GNU_CXX']: CXXFLAGS += ['-Wshadow'] diff --git a/ipc/chromium/moz.build b/ipc/chromium/moz.build index df22550e69110..d85366c6d9f31 100644 --- a/ipc/chromium/moz.build +++ b/ipc/chromium/moz.build @@ -135,8 +135,6 @@ if os_linux: ] DEFINES['ANDROID'] = True DEFINES['_POSIX_MONOTONIC_CLOCK'] = 0 - if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': - DEFINES['HAVE_ANDROID_OS'] = True if os_bsd or os_linux: if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']: diff --git a/ipc/moz.build b/ipc/moz.build index c667d372ae0dd..c17bcaac6a3b9 100644 --- a/ipc/moz.build +++ b/ipc/moz.build @@ -14,12 +14,6 @@ DIRS += [ if CONFIG['MOZ_ENABLE_DBUS']: DIRS += ['dbus'] -if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': - DIRS += ['unixfd', 'unixsocket'] - -if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': - DIRS += ['hal', 'netd'] - if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android': DIRS += ['contentproc'] @@ -28,5 +22,5 @@ if CONFIG['OS_ARCH'] == 'WINNT': DIRS += ['app'] -with Files("**"): - BUG_COMPONENT = ("Core", "IPC") +with Files("**"): + BUG_COMPONENT = ("Core", "IPC") diff --git a/layout/build/moz.build b/layout/build/moz.build index f7941b5061b3d..3ed7452630932 100644 --- a/layout/build/moz.build +++ b/layout/build/moz.build @@ -74,10 +74,6 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android': '/dom/system', '/dom/system/android', ] -elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': - LOCAL_INCLUDES += [ - '/dom/system/gonk', - ] if CONFIG['MOZ_WEBSPEECH']: LOCAL_INCLUDES += [ diff --git a/media/libcubeb/src/moz.build b/media/libcubeb/src/moz.build index 98e14807b8487..bf67249211cd3 100644 --- a/media/libcubeb/src/moz.build +++ b/media/libcubeb/src/moz.build @@ -31,8 +31,6 @@ if CONFIG['MOZ_PULSEAUDIO']: 'cubeb_pulse.c', ] DEFINES['USE_PULSE'] = True - if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': - DEFINES['DISABLE_LIBPULSE_DLOPEN'] = True if CONFIG['MOZ_JACK']: SOURCES += [ @@ -78,24 +76,13 @@ if CONFIG['OS_TARGET'] == 'Android': SOURCES += ['cubeb_opensl.c'] SOURCES += ['cubeb_resampler.cpp'] DEFINES['USE_OPENSL'] = True - if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk': - SOURCES += [ - 'cubeb_audiotrack.c', - ] - DEFINES['USE_AUDIOTRACK'] = True + SOURCES += [ + 'cubeb_audiotrack.c', + ] + DEFINES['USE_AUDIOTRACK'] = True FINAL_LIBRARY = 'gkmedias' -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'], - ] - CFLAGS += CONFIG['MOZ_ALSA_CFLAGS'] CFLAGS += CONFIG['MOZ_PULSEAUDIO_CFLAGS'] diff --git a/media/mtransport/test/moz.build b/media/mtransport/test/moz.build index e8f4537873727..d769e62f292d4 100644 --- a/media/mtransport/test/moz.build +++ b/media/mtransport/test/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['OS_TARGET'] != 'WINNT' and CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk': +if CONFIG['OS_TARGET'] != 'WINNT': SOURCES += [ 'buffered_stun_socket_unittest.cpp', 'ice_unittest.cpp', diff --git a/media/omx-plugin/lib/ics/libstagefright/moz.build b/media/omx-plugin/lib/ics/libstagefright/moz.build index 1fe19a5fd824e..b156d151e2819 100644 --- a/media/omx-plugin/lib/ics/libstagefright/moz.build +++ b/media/omx-plugin/lib/ics/libstagefright/moz.build @@ -5,14 +5,13 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. DIST_INSTALL = False -if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk': - SOURCES += [ - 'libstagefright.cpp', - ] - # Some codec-related code uses multi-character constants; allow this. - # XXX: could instead use the FOURCC macro to define these constants. - if CONFIG['GNU_CC'] or CONFIG['CLANG_CL']: - SOURCES['libstagefright.cpp'].flags += ['-Wno-error=multichar'] +SOURCES += [ + 'libstagefright.cpp', +] +# Some codec-related code uses multi-character constants; allow this. +# XXX: could instead use the FOURCC macro to define these constants. +if CONFIG['GNU_CC'] or CONFIG['CLANG_CL']: + SOURCES['libstagefright.cpp'].flags += ['-Wno-error=multichar'] SharedLibrary('stagefright') diff --git a/media/omx-plugin/lib/ics/libutils/moz.build b/media/omx-plugin/lib/ics/libutils/moz.build index efce12194f0fb..7fa617fb381d5 100644 --- a/media/omx-plugin/lib/ics/libutils/moz.build +++ b/media/omx-plugin/lib/ics/libutils/moz.build @@ -5,10 +5,9 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. DIST_INSTALL = False -if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk': - SOURCES += [ - 'libutils.cpp', - ] +SOURCES += [ + 'libutils.cpp', +] SharedLibrary('utils') diff --git a/media/omx-plugin/lib/ics/libvideoeditorplayer/moz.build b/media/omx-plugin/lib/ics/libvideoeditorplayer/moz.build index 4314b1aa2d739..f05f0f3c90289 100644 --- a/media/omx-plugin/lib/ics/libvideoeditorplayer/moz.build +++ b/media/omx-plugin/lib/ics/libvideoeditorplayer/moz.build @@ -5,10 +5,9 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. DIST_INSTALL = False -if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk': - SOURCES += [ - 'libvideoeditorplayer.cpp', - ] +SOURCES += [ + 'libvideoeditorplayer.cpp', +] SharedLibrary('videoeditorplayer') diff --git a/media/omx-plugin/moz.build b/media/omx-plugin/moz.build index 7e9129c85fec0..0cce96731a530 100644 --- a/media/omx-plugin/moz.build +++ b/media/omx-plugin/moz.build @@ -23,13 +23,10 @@ SOURCES += [ SharedLibrary('omxplugin') -if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': - pass -else: - LOCAL_INCLUDES += [ - 'include/ics', - 'include/ics/media/stagefright/openmax', - ] +LOCAL_INCLUDES += [ + 'include/ics', + 'include/ics/media/stagefright/openmax', +] if CONFIG['GNU_CXX']: # Stagefright header files define many multichar constants. @@ -38,23 +35,11 @@ if CONFIG['GNU_CXX']: '-Wno-shadow', ] -if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': - EXTRA_DSO_LDOPTS += [ - '-lutils', - '-lstagefright', - '-lmedia', - '-lstagefright_omx', - '-lbinder', - '-lui', - '-lhardware', - '-lcutils', - ] -else: - USE_LIBS += [ - '/media/omx-plugin/lib/ics/libstagefright/stagefright', - '/media/omx-plugin/lib/ics/libutils/utils', - 'videoeditorplayer', - ] +USE_LIBS += [ + '/media/omx-plugin/lib/ics/libstagefright/stagefright', + '/media/omx-plugin/lib/ics/libutils/utils', + 'videoeditorplayer', +] # Don't use STL wrappers; this isn't Gecko code DISABLE_STL_WRAPPING = True diff --git a/mozglue/build/moz.build b/mozglue/build/moz.build index 2858dd255b1fa..360cafc6703ce 100644 --- a/mozglue/build/moz.build +++ b/mozglue/build/moz.build @@ -79,11 +79,6 @@ if not CONFIG['JS_STANDALONE']: 'zlib', ] - if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': - SOURCES += [ - 'cpuacct.c', - ] - USE_LIBS += [ 'mfbt', ] diff --git a/netwerk/base/moz.build b/netwerk/base/moz.build index 71746bb2f6698..aba296c6aa0c9 100644 --- a/netwerk/base/moz.build +++ b/netwerk/base/moz.build @@ -180,11 +180,6 @@ EXPORTS.mozilla.net += [ 'ReferrerPolicy.h', ] -if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': - EXPORTS += [ - 'NetStatistics.h', - ] - UNIFIED_SOURCES += [ 'ArrayBufferInputStream.cpp', 'BackgroundFileSaver.cpp', diff --git a/netwerk/dns/mdns/libmdns/moz.build b/netwerk/dns/mdns/libmdns/moz.build index d2dca4955fd9d..efad64d64a940 100644 --- a/netwerk/dns/mdns/libmdns/moz.build +++ b/netwerk/dns/mdns/libmdns/moz.build @@ -4,8 +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_WIDGET_TOOLKIT'] == 'cocoa' or \ - (CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk' and CONFIG['ANDROID_VERSION'] >= '16'): +if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': UNIFIED_SOURCES += [ 'MDNSResponderOperator.cpp', 'MDNSResponderReply.cpp', @@ -16,13 +15,6 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa' or \ '/netwerk/base', ] - if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': - LOCAL_INCLUDES += [ - '%' + '%s/%s' % (CONFIG['ANDROID_SOURCE'], d) for d in [ - 'external/mdnsresponder/mDNSShared', - ] - ] - else: EXTRA_COMPONENTS += [ 'nsDNSServiceDiscovery.js', diff --git a/netwerk/wifi/moz.build b/netwerk/wifi/moz.build index e3edb08421873..7aef5e2e01f2e 100644 --- a/netwerk/wifi/moz.build +++ b/netwerk/wifi/moz.build @@ -14,17 +14,9 @@ XPIDL_MODULE = 'necko_wifi' UNIFIED_SOURCES += [ 'nsWifiAccessPoint.cpp', + 'nsWifiMonitor.cpp', ] -if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': - UNIFIED_SOURCES += [ - 'nsWifiMonitorGonk.cpp', - ] -else: - UNIFIED_SOURCES += [ - 'nsWifiMonitor.cpp', - ] - if CONFIG['OS_ARCH'] == 'Darwin': UNIFIED_SOURCES += [ 'nsWifiScannerMac.cpp', diff --git a/python/mozbuild/mozbuild/backend/cpp_eclipse.py b/python/mozbuild/mozbuild/backend/cpp_eclipse.py index cbdbdde8caabb..ae89df5b20f74 100644 --- a/python/mozbuild/mozbuild/backend/cpp_eclipse.py +++ b/python/mozbuild/mozbuild/backend/cpp_eclipse.py @@ -183,25 +183,12 @@ def _write_launch_files(self, launch_dir): exe_path = os.path.join(exe_path, self._appname + self._bin_suffix) - if self.environment.substs['MOZ_WIDGET_TOOLKIT'] != 'gonk': - main_gecko_launch = os.path.join(launch_dir, 'gecko.launch') - with open(main_gecko_launch, 'wb') as fh: - launch = GECKO_LAUNCH_CONFIG_TEMPLATE - launch = launch.replace('@LAUNCH_PROGRAM@', exe_path) - launch = launch.replace('@LAUNCH_ARGS@', '-P -no-remote') - fh.write(launch) - - if self.environment.substs['MOZ_WIDGET_TOOLKIT'] == 'gonk': - b2g_flash = os.path.join(launch_dir, 'b2g-flash.launch') - with open(b2g_flash, 'wb') as fh: - # We assume that the srcdir is inside the b2g tree. - # If that's not the case the user can always adjust the path - # from the eclipse IDE. - fastxul_path = os.path.join(self.environment.topsrcdir, '..', 'scripts', 'fastxul.sh') - launch = B2GFLASH_LAUNCH_CONFIG_TEMPLATE - launch = launch.replace('@LAUNCH_PROGRAM@', fastxul_path) - launch = launch.replace('@OBJDIR@', self.environment.topobjdir) - fh.write(launch) + main_gecko_launch = os.path.join(launch_dir, 'gecko.launch') + with open(main_gecko_launch, 'wb') as fh: + launch = GECKO_LAUNCH_CONFIG_TEMPLATE + launch = launch.replace('@LAUNCH_PROGRAM@', exe_path) + launch = launch.replace('@LAUNCH_ARGS@', '-P -no-remote') + fh.write(launch) #TODO Add more launch configs (and delegate calls to mach) diff --git a/python/mozbuild/mozbuild/base.py b/python/mozbuild/mozbuild/base.py index cfbb4652cde77..6267aeb5c5e56 100644 --- a/python/mozbuild/mozbuild/base.py +++ b/python/mozbuild/mozbuild/base.py @@ -734,13 +734,6 @@ def is_firefox(cls): return cls.substs.get('MOZ_BUILD_APP') == 'browser' return False - @staticmethod - def is_b2g(cls): - """Must have a B2G build.""" - if hasattr(cls, 'substs'): - return cls.substs.get('MOZ_WIDGET_TOOLKIT') == 'gonk' - return False - @staticmethod def is_android(cls): """Must have an Android build.""" diff --git a/python/mozbuild/mozbuild/mozinfo.py b/python/mozbuild/mozbuild/mozinfo.py index 360af615e6167..4e673895d8dbd 100755 --- a/python/mozbuild/mozbuild/mozinfo.py +++ b/python/mozbuild/mozbuild/mozinfo.py @@ -37,7 +37,7 @@ def build_dict(config, env=os.environ): known_os = {"Linux": "linux", "WINNT": "win", "Darwin": "mac", - "Android": "b2g" if substs.get("MOZ_WIDGET_TOOLKIT") == "gonk" else "android"} + "Android": "android"} if o in known_os: d["os"] = known_os[o] else: diff --git a/python/mozbuild/mozbuild/test/test_testing.py b/python/mozbuild/mozbuild/test/test_testing.py index 38a88574fe4a2..dd5712f21eec6 100644 --- a/python/mozbuild/mozbuild/test/test_testing.py +++ b/python/mozbuild/mozbuild/test/test_testing.py @@ -78,7 +78,7 @@ "reason": "bug 820380", "relpath": "test_0201_app_launch_apply_update.js", "run-sequentially": "Launches application.", - "skip-if": "toolkit == 'gonk' || os == 'android'", + "skip-if": "os == 'android'", }, { "dir_relpath": "toolkit/mozapps/update/test/unit", @@ -93,7 +93,7 @@ "reason": "bug 820380", "relpath": "test_0201_app_launch_apply_update.js", "run-sequentially": "Launches application.", - "skip-if": "toolkit == 'gonk' || os == 'android'", + "skip-if": "os == 'android'", } ], "mobile/android/tests/background/junit3/src/common/TestAndroidLogWriters.java": [ diff --git a/security/sandbox/linux/broker/moz.build b/security/sandbox/linux/broker/moz.build index 858e1ad83e92c..1db01bce7592a 100644 --- a/security/sandbox/linux/broker/moz.build +++ b/security/sandbox/linux/broker/moz.build @@ -16,10 +16,6 @@ SOURCES += [ 'SandboxBrokerPolicyFactory.cpp', ] -if CONFIG['OS_TARGET'] == 'Android': - if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': - DEFINES['HAVE_ANDROID_OS'] = True - if CONFIG['MOZ_ALSA']: DEFINES['MOZ_ALSA'] = True diff --git a/testing/marionette/harness/marionette_harness/tests/webapi-tests.ini b/testing/marionette/harness/marionette_harness/tests/webapi-tests.ini index 7a0a549475d81..0fa1f0080c14f 100644 --- a/testing/marionette/harness/marionette_harness/tests/webapi-tests.ini +++ b/testing/marionette/harness/marionette_harness/tests/webapi-tests.ini @@ -1,4 +1,3 @@ -[include:../../../../../dom/system/gonk/tests/marionette/manifest.ini] [include:../../../../../dom/events/test/marionette/manifest.ini] skip-if = android_version > '15' # Bug 1203075 [include:../../../../../dom/network/tests/marionette/manifest.ini] diff --git a/toolkit/crashreporter/breakpad-client/linux/moz.build b/toolkit/crashreporter/breakpad-client/linux/moz.build index 73a08eb16e62c..d84a33956b3f3 100644 --- a/toolkit/crashreporter/breakpad-client/linux/moz.build +++ b/toolkit/crashreporter/breakpad-client/linux/moz.build @@ -37,7 +37,4 @@ if CONFIG['OS_TARGET'] == 'Android' and CONFIG['CPU_ARCH'] == 'x86': # The NDK's user.h defines this struct with a different name. DEFINES['user_fpxregs_struct'] = 'user_fxsr_struct' -if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': - DEFINES['getcontext'] = 'breakpad_getcontext' - include('/toolkit/crashreporter/crashreporter.mozbuild') diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build index 79debb3f88e1b..191e90ceb09a5 100644 --- a/toolkit/library/moz.build +++ b/toolkit/library/moz.build @@ -199,11 +199,6 @@ if CONFIG['OS_ARCH'] == 'WINNT': 'winspool', ] -if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': - OS_LIBS += [ - 'dbus', - ] - if CONFIG['OS_ARCH'] == 'Linux' and CONFIG['OS_TARGET'] != 'Android': OS_LIBS += [ 'rt', @@ -242,35 +237,6 @@ if CONFIG['MOZ_ALSA']: if CONFIG['HAVE_CLOCK_MONOTONIC']: OS_LIBS += CONFIG['REALTIME_LIBS'] -if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': - OS_LIBS += [ - 'ui', - 'media', - 'hardware_legacy', - 'hardware', - 'utils', - 'cutils', - 'sysutils', - 'camera_client', - 'sensorservice', - 'stagefright', - 'stagefright_foundation', - 'stagefright_omx', - 'binder', - 'gui', - 'mtp', - ] - - if int(CONFIG['ANDROID_VERSION']) >= 17: - OS_LIBS += [ - 'sync', - ] - - if CONFIG['ANDROID_VERSION'] >= '16': - OS_LIBS += [ - 'mdnssd', - ] - if 'rtsp' in CONFIG['NECKO_PROTOCOLS']: OS_LIBS += [ 'stagefright_foundation', diff --git a/toolkit/moz.configure b/toolkit/moz.configure index ed6310060d27a..d6b0e1062eb06 100644 --- a/toolkit/moz.configure +++ b/toolkit/moz.configure @@ -118,7 +118,7 @@ set_config('L10NBASEDIR', l10n_base) # reason. option('--enable-default-toolkit', nargs=1, choices=('cairo-windows', 'cairo-gtk3', 'cairo-gtk3-wayland', - 'cairo-cocoa', 'cairo-uikit', 'cairo-android', 'cairo-gonk'), + 'cairo-cocoa', 'cairo-uikit', 'cairo-android'), help='Select default toolkit') @depends('--enable-default-toolkit', target, '--help') @@ -250,7 +250,7 @@ set_define(gl_provider_define, True) # ============================================================== @depends(toolkit) def pdf_printing(toolkit): - if toolkit in ('windows', 'gtk2', 'gtk3', 'android', 'gonk'): + if toolkit in ('windows', 'gtk2', 'gtk3', 'android'): return True @depends(pdf_printing) @@ -272,8 +272,8 @@ option(env='MOZ_INSTRUMENT_EVENT_LOOP', @depends('MOZ_INSTRUMENT_EVENT_LOOP', toolkit) def instrument_event_loop(value, toolkit): - if value or (toolkit in ('windows', 'gtk2', 'gtk3', 'cocoa', 'android', - 'gonk') and value.origin == 'default'): + if value or (toolkit in ('windows', 'gtk2', 'gtk3', 'cocoa', 'android') and + value.origin == 'default'): return True set_config('MOZ_INSTRUMENT_EVENT_LOOP', instrument_event_loop) @@ -1005,9 +1005,9 @@ set_config('MOZ_MORTAR', True, when='--enable-mortar') # Marionette isn't really a toolkit feature, it's a Gecko engine feature, but # it's enabled based on the toolkit (and target), so here it lives. -@depends(target, toolkit) -def marionette_default(target, toolkit): - # By default, enable Marionette if not Android and not gonk. +@depends(target) +def marionette_default(target): + # By default, enable Marionette if not Android. # # None means "don't set anything", which allows to override with # --enable-marionette. False means --disable-marionette, which @@ -1016,13 +1016,10 @@ def marionette_default(target, toolkit): if target.os == 'Android': return None - if toolkit == 'gonk': - return None - return True imply_option('--enable-marionette', marionette_default, - reason='not Android and not gonk') + reason='not Android') option('--enable-marionette', help='Enable internal Marionette command server') diff --git a/tools/profiler/moz.build b/tools/profiler/moz.build index 294a4ac52c80a..8485390fa4c2e 100644 --- a/tools/profiler/moz.build +++ b/tools/profiler/moz.build @@ -106,9 +106,6 @@ if CONFIG['MOZ_GECKO_PROFILER']: if CONFIG['ENABLE_TESTS']: DIRS += ['tests/gtest'] - if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk' and (CONFIG['ANDROID_VERSION'] <= '17' or CONFIG['ANDROID_VERSION'] >= '21'): - DEFINES['ELFSIZE'] = 32 - FINAL_LIBRARY = 'xul' IPDL_SOURCES += [ diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build index d8b874baad096..3349d5006901b 100644 --- a/uriloader/exthandler/moz.build +++ b/uriloader/exthandler/moz.build @@ -24,7 +24,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': LOCAL_INCLUDES += ['win'] elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': osdir = 'mac' -elif CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gonk', 'uikit'): +elif CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'uikit'): osdir = CONFIG['MOZ_WIDGET_TOOLKIT'] else: osdir = 'unix' diff --git a/widget/moz.build b/widget/moz.build index ad8adabe1f57a..cb9b5e567ff74 100644 --- a/widget/moz.build +++ b/widget/moz.build @@ -30,9 +30,9 @@ with Files("*FontRange*"): toolkit = CONFIG['MOZ_WIDGET_TOOLKIT'] -if toolkit in ('cocoa', 'android', 'gonk', 'uikit'): +if toolkit in ('cocoa', 'android', 'uikit'): DIRS += [toolkit] -if toolkit in ('android', 'cocoa', 'gonk', 'gtk2', 'gtk3'): +if toolkit in ('android', 'cocoa', 'gtk2', 'gtk3'): EXPORTS += ['nsIPrintDialogService.h'] if toolkit == 'windows': @@ -255,7 +255,7 @@ if toolkit in ('cocoa', 'windows'): ] if toolkit in {'gtk2', 'gtk3', 'cocoa', 'windows', - 'android', 'gonk', 'uikit'}: + 'android', 'uikit'}: UNIFIED_SOURCES += [ 'nsBaseFilePicker.cpp', ] diff --git a/xpcom/threads/moz.build b/xpcom/threads/moz.build index 3192efc4a4dd9..79725e7f5a4df 100644 --- a/xpcom/threads/moz.build +++ b/xpcom/threads/moz.build @@ -94,11 +94,9 @@ LOCAL_INCLUDES += [ # BHR disabled for Release builds because of bug 965392. # BHR disabled for debug builds because of bug 979069. -# BHR disabled on gonk because of bug 1180533 # BHR disabled for TSan builds because of bug 1121216. if CONFIG['MOZ_UPDATE_CHANNEL'] not in ('release') and \ not CONFIG['MOZ_DEBUG'] and \ - not CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk' and \ not CONFIG['MOZ_TSAN']: DEFINES['MOZ_ENABLE_BACKGROUND_HANG_MONITOR'] = 1