diff options
| -rw-r--r-- | build/gyp.mozbuild | 1 | ||||
| -rw-r--r-- | media/mtransport/third_party/nICEr/nicer.gyp | 12 | ||||
| -rw-r--r-- | media/webrtc/signaling/signaling.gyp | 7 | ||||
| -rw-r--r-- | media/webrtc/trunk/build/common.gypi | 2 | ||||
| -rw-r--r-- | media/webrtc/trunk/webrtc/build/common.gypi | 7 | ||||
| -rw-r--r-- | media/webrtc/trunk/webrtc/modules/audio_device/audio_device.gypi | 21 | ||||
| -rw-r--r-- | media/webrtc/trunk/webrtc/system_wrappers/cpu_features_webrtc.gyp | 2 | ||||
| -rw-r--r-- | media/webrtc/trunk/webrtc/system_wrappers/system_wrappers.gyp | 2 |
8 files changed, 6 insertions, 48 deletions
diff --git a/build/gyp.mozbuild b/build/gyp.mozbuild index 10c3af95dc..fd8714ecf0 100644 --- a/build/gyp.mozbuild +++ b/build/gyp.mozbuild @@ -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, diff --git a/media/mtransport/third_party/nICEr/nicer.gyp b/media/mtransport/third_party/nICEr/nicer.gyp index 9df4a4b28e..470fa8eb6f 100644 --- a/media/mtransport/third_party/nICEr/nicer.gyp +++ b/media/mtransport/third_party/nICEr/nicer.gyp @@ -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", diff --git a/media/webrtc/signaling/signaling.gyp b/media/webrtc/signaling/signaling.gyp index ee1941151a..0fcf2ac5d0 100644 --- a/media/webrtc/signaling/signaling.gyp +++ b/media/webrtc/signaling/signaling.gyp @@ -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. diff --git a/media/webrtc/trunk/build/common.gypi b/media/webrtc/trunk/build/common.gypi index 5382cdf419..68003ba06f 100644 --- a/media/webrtc/trunk/build/common.gypi +++ b/media/webrtc/trunk/build/common.gypi @@ -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, }, { diff --git a/media/webrtc/trunk/webrtc/build/common.gypi b/media/webrtc/trunk/webrtc/build/common.gypi index 5c26c98e33..97bf78628e 100644 --- a/media/webrtc/trunk/webrtc/build/common.gypi +++ b/media/webrtc/trunk/webrtc/build/common.gypi @@ -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', ], diff --git a/media/webrtc/trunk/webrtc/modules/audio_device/audio_device.gypi b/media/webrtc/trunk/webrtc/modules/audio_device/audio_device.gypi index f6ad9cbd7b..495ff23b7f 100644 --- a/media/webrtc/trunk/webrtc/modules/audio_device/audio_device.gypi +++ b/media/webrtc/trunk/webrtc/modules/audio_device/audio_device.gypi @@ -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', diff --git a/media/webrtc/trunk/webrtc/system_wrappers/cpu_features_webrtc.gyp b/media/webrtc/trunk/webrtc/system_wrappers/cpu_features_webrtc.gyp index 91d2680485..8064f280e5 100644 --- a/media/webrtc/trunk/webrtc/system_wrappers/cpu_features_webrtc.gyp +++ b/media/webrtc/trunk/webrtc/system_wrappers/cpu_features_webrtc.gyp @@ -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', diff --git a/media/webrtc/trunk/webrtc/system_wrappers/system_wrappers.gyp b/media/webrtc/trunk/webrtc/system_wrappers/system_wrappers.gyp index 68164b38a0..fb76f34a59 100644 --- a/media/webrtc/trunk/webrtc/system_wrappers/system_wrappers.gyp +++ b/media/webrtc/trunk/webrtc/system_wrappers/system_wrappers.gyp @@ -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 |