summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
Diffstat (limited to 'build')
-rw-r--r--build/gyp.mozbuild19
1 files changed, 6 insertions, 13 deletions
diff --git a/build/gyp.mozbuild b/build/gyp.mozbuild
index ff04f6aac..10c3af95d 100644
--- a/build/gyp.mozbuild
+++ b/build/gyp.mozbuild
@@ -79,22 +79,15 @@ if os == 'WINNT':
MSVS_OS_BITS=64 if CONFIG['HAVE_64BIT_BUILD'] else 32,
)
elif 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', ''),
+ )
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',