Chromium Code Reviews| Index: scripts/slave/recipe_modules/webrtc/chromium_config.py |
| diff --git a/scripts/slave/recipe_modules/webrtc/chromium_config.py b/scripts/slave/recipe_modules/webrtc/chromium_config.py |
| index 14aad8f2c174f1a1c4487fdd60eb543d6625a1ec..47b7e10797ed5e9a6a804d8a750f325c1ad89b65 100644 |
| --- a/scripts/slave/recipe_modules/webrtc/chromium_config.py |
| +++ b/scripts/slave/recipe_modules/webrtc/chromium_config.py |
| @@ -12,7 +12,7 @@ CONFIG_CTX = DEPS['chromium'].CONFIG_CTX |
| SUPPORTED_TARGET_ARCHS = ('intel', 'arm') |
| -@CONFIG_CTX(includes=['chromium', 'dcheck']) |
| +@CONFIG_CTX(includes=['chromium', 'dcheck', 'webrtc_openh264']) |
| def webrtc_standalone(c): |
| _compiler_defaults(c) |
| @@ -25,7 +25,7 @@ def webrtc_standalone(c): |
| def webrtc_gcc(c): |
| _compiler_defaults(c) |
| -@CONFIG_CTX(includes=['chromium_clang', 'dcheck']) |
| +@CONFIG_CTX(includes=['chromium_clang', 'dcheck', 'webrtc_openh264']) |
| def webrtc_clang(c): |
| _compiler_defaults(c) |
| @@ -50,11 +50,27 @@ def webrtc_ios(c): |
| @CONFIG_CTX(includes=['gn']) |
| def webrtc_gn(c): |
| c.compile_py.default_targets = ['all'] |
| + if c.TARGET_PLATFORM != 'ios' and c.TARGET_PLATFORM != 'android': |
| + c.gn_args = [ |
| + 'ffmpeg_branding="Chrome"', |
| + 'rtc_use_h264=true', |
| + ] |
| -@CONFIG_CTX(includes=['gn']) |
| +@CONFIG_CTX(includes=['webrtc_gn']) |
|
hbos_chromium
2016/01/25 14:00:15
Wait, was this change on purpose? Looks unrelated
phoglund_chromium
2016/01/28 10:50:13
Yeah, I better get rid of these changes, it looks
phoglund_chromium
2016/01/28 10:54:57
Aha, never mind. The purpose of this change is to
|
| def webrtc_libfuzzer(c): |
| - c.gn_args = ['use_libfuzzer=true', |
| - 'is_asan=true'] |
| + c.gn_args.extend([ |
| + 'use_libfuzzer=true', |
| + 'is_asan=true', |
| + ]) |
| + |
| +@CONFIG_CTX() |
| +def webrtc_openh264(c): |
| + if c.TARGET_PLATFORM == 'ios': |
| + raise BadConf('ffmpeg decode not supported for iOS') # pragma: no cover |
| + if c.TARGET_PLATFORM == 'android': |
| + raise BadConf('h264 decode not supported for Android') # pragma: no cover |
| + c.gyp_env.GYP_DEFINES['ffmpeg_branding'] = 'Chrome' |
| + c.gyp_env.GYP_DEFINES['rtc_use_264'] = 1 |
| def _compiler_defaults(c): |
| c.compile_py.default_targets = ['All'] |