summaryrefslogtreecommitdiff
path: root/build
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2021-11-20 21:12:52 -0500
committerMoonchild <moonchild@palemoon.org>2022-04-07 15:42:13 +0200
commit3b48d984b2a0524ed9ca26b48f09831d9d88fc2e (patch)
tree278a6839f715b7c117dd254b90559e75cad88ab8 /build
parent02afcba61492797f77d54bde3c919e59b2772036 (diff)
downloaduxp-3b48d984b2a0524ed9ca26b48f09831d9d88fc2e.tar.gz
Issue #1847 - Restore build/gyp.mozbuild to m-esr52 state.
To do: remove android stuff again at the end.
Diffstat (limited to 'build')
-rw-r--r--build/gyp.mozbuild24
1 files changed, 23 insertions, 1 deletions
diff --git a/build/gyp.mozbuild b/build/gyp.mozbuild
index 9e6b63d7ad..ff04f6aac1 100644
--- a/build/gyp.mozbuild
+++ b/build/gyp.mozbuild
@@ -1,4 +1,5 @@
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# 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/.
@@ -18,6 +19,8 @@ gyp_vars = {
'clang_use_chrome_plugins': 0,
'enable_protobuf': 0,
'include_tests': 0,
+ 'enable_android_opensl': 1,
+ 'enable_android_opensl_output': 0,
# use_system_lib* still seems to be in use in trunk/build
'use_system_libjpeg': 0,
'use_system_libvpx': 0,
@@ -41,6 +44,7 @@ gyp_vars = {
'arm_neon': 0,
'arm_neon_optional': 1,
+ 'moz_widget_toolkit_gonk': 0,
'moz_webrtc_omx': 0,
'moz_webrtc_mediacodec': 0,
@@ -74,10 +78,25 @@ if os == 'WINNT':
MSVS_VERSION=CONFIG['_MSVS_VERSION'],
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', ''),
+ )
flavors = {
'WINNT': 'win',
+ 'Android': 'linux' if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk' else 'android',
'Linux': 'linux',
+ 'Darwin': 'mac' if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa' else 'ios',
'SunOS': 'solaris',
'GNU/kFreeBSD': 'freebsd',
'DragonFly': 'dragonfly',
@@ -99,8 +118,11 @@ if CONFIG['ARM_ARCH']:
if int(CONFIG['ARM_ARCH']) < 7:
gyp_vars['armv7'] = 0
gyp_vars['arm_neon_optional'] = 0
+ elif os == 'Android':
+ gyp_vars['armv7'] = 1
else:
- # armv7 always uses CPU detection, so we have to set armv7=0
+ # CPU detection for ARM works on Android only. armv7 always uses CPU
+ # detection, so we have to set armv7=0 for non-Android target
gyp_vars['armv7'] = 0
# For libyuv
gyp_vars['arm_version'] = int(CONFIG['ARM_ARCH'])