wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-05 07:18:39 +09:00
Code Issues Projects Releases Packages Wiki Activity

Remove moz_widget_toolkit_gonk

Browse source 
Tag #288
This commit is contained in:
wolfbeast 2018-05-14 13:28:04 +02:00 • committed by Roy Tam
commit fd9202fef0
8 changed files with 6 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

1
build/gyp.mozbuild
View file

@ -44,7 +44,6 @@ gyp_vars = {
'arm_neon': 0,
'arm_neon_optional': 1,
'moz_widget_toolkit_gonk': 0,
'moz_webrtc_omx': 0,
'moz_webrtc_mediacodec': 0,

12
media/mtransport/third_party/nICEr/nicer.gyp vendored
View file

@ -231,18 +231,6 @@
'sources': [
],
}],
['moz_widget_toolkit_gonk==1', {
'defines' : [
'WEBRTC_GONK',
'NO_REG_RPC',
],
}],
# Gonk has its own nr_stun_get_addrs implementation.
['build_with_gonk==1', {
'defines': [
"USE_PLATFORM_NR_STUN_GET_ADDRS",
]
}],
['have_ethtool_cmd_speed_hi==0', {
'defines': [
"DONT_HAVE_ETHTOOL_SPEED_HI",

7
media/webrtc/signaling/signaling.gyp
View file

@ -41,11 +41,6 @@
'target_defaults': {
'conditions': [
['moz_widget_toolkit_gonk==1', {
'defines' : [
'WEBRTC_GONK',
],
}],
],
},
@ -316,7 +311,7 @@
'cflags_mozilla': [
],
}],
['OS=="android" or moz_widget_toolkit_gonk==1', {
['OS=="android"', {
'cflags_mozilla': [
# This warning complains about important MOZ_EXPORT attributes
# on forward declarations for Android API types.

2
media/webrtc/trunk/build/common.gypi
View file

@ -428,7 +428,7 @@
}],
# Flags to use X11 on non-Mac POSIX platforms
['OS=="win" or OS=="mac" or OS=="ios" or OS=="android" or moz_widget_toolkit_gonk==1', {
['OS=="win" or OS=="mac" or OS=="ios" or OS=="android"', {
'use_glib%': 0,
'use_x11%': 0,
}, {

7
media/webrtc/trunk/webrtc/build/common.gypi
View file

@ -196,11 +196,6 @@
},
'target_defaults': {
'conditions': [
['moz_widget_toolkit_gonk==1', {
'defines' : [
'WEBRTC_GONK',
],
}],
['restrict_webrtc_logging==1', {
'defines': ['WEBRTC_RESTRICT_LOGGING',],
}],
@ -417,7 +412,7 @@
'msvs_disabled_warnings!': [4189,],
}],
# used on GONK as well
['enable_android_opensl==1 and (OS=="android" or moz_widget_toolkit_gonk==1)', {
['enable_android_opensl==1 and OS=="android"', {
'defines': [
'WEBRTC_ANDROID_OPENSLES',
],

21
media/webrtc/trunk/webrtc/modules/audio_device/audio_device.gypi
View file

@ -92,18 +92,6 @@
'android',
],
}], # OS==android
['moz_widget_toolkit_gonk==1', {
'cflags_mozilla': [
'-I$(ANDROID_SOURCE)/frameworks/wilhelm/include',
'-I$(ANDROID_SOURCE)/frameworks/av/include',
'-I$(ANDROID_SOURCE)/system/media/wilhelm/include',
'-I$(ANDROID_SOURCE)/system/media/audio_effects/include',
'-I$(ANDROID_SOURCE)/frameworks/native/include',
],
'include_dirs': [
'android',
],
}], # moz_widget_toolkit_gonk==1
['enable_android_opensl==1', {
'include_dirs': [
'opensl',
@ -162,14 +150,7 @@
'android/audio_track_jni.h',
],
'conditions': [
['moz_widget_toolkit_gonk==1', {
'sources': [
# references to android/audio_manager to avoid platform-specific limits
'gonk/audio_manager.cc',
'gonk/audio_manager.h',
],
}],
['OS=="android" or moz_widget_toolkit_gonk==1', {
['OS=="android"', {
'link_settings': {
'libraries': [
'-llog',

2
media/webrtc/trunk/webrtc/system_wrappers/cpu_features_webrtc.gyp
View file

@ -11,7 +11,7 @@
'include_ndk_cpu_features%': 0,
},
'conditions': [
['OS=="android" or moz_widget_toolkit_gonk==1', {
['OS=="android"', {
'targets': [
{
'target_name': 'cpu_features_android',

2
media/webrtc/trunk/webrtc/system_wrappers/system_wrappers.gyp
View file

@ -119,7 +119,7 @@
'source/metrics_default.cc',
],
}],
['OS=="android" or moz_widget_toolkit_gonk==1', {
['OS=="android"', {
'defines': [
'WEBRTC_THREAD_RR',
# TODO(leozwang): Investigate CLOCK_REALTIME and CLOCK_MONOTONIC