| Index: scripts/slave/recipe_modules/libyuv/chromium_config.py
|
| diff --git a/scripts/slave/recipe_modules/libyuv/chromium_config.py b/scripts/slave/recipe_modules/libyuv/chromium_config.py
|
| index 4c98496f1ba1398fcc19fbe901cc9dfba75d6c3a..0b9a85b39e609eb581c66cd8246e7bc66d15bcf0 100644
|
| --- a/scripts/slave/recipe_modules/libyuv/chromium_config.py
|
| +++ b/scripts/slave/recipe_modules/libyuv/chromium_config.py
|
| @@ -29,10 +29,13 @@ def libyuv_gcc(c):
|
| def libyuv_android(c):
|
| if c.TARGET_ARCH == 'intel' and c.TARGET_BITS == 32:
|
| c.gyp_env.GYP_DEFINES['android_full_debug'] = 1
|
| + c.gn_args.append('android_full_debug=true')
|
| +
|
| + _libyuv_static_build(c)
|
|
|
| @CONFIG_CTX(includes=['android_clang'])
|
| def libyuv_android_clang(c):
|
| - pass
|
| + _libyuv_static_build(c)
|
|
|
| @CONFIG_CTX(includes=['chromium', 'static_library'])
|
| def libyuv_ios(c):
|
| @@ -49,7 +52,17 @@ def libyuv_ios(c):
|
| if c.TARGET_BITS == 64:
|
| gyp_defs['target_subarch'] = 'arm64'
|
|
|
| + c.gn_args.append('target_os=%s' % c.TARGET_PLATFORM)
|
| _libyuv_common(c)
|
| + _libyuv_static_build(c)
|
|
|
| def _libyuv_common(c):
|
| - c.compile_py.default_targets = ['All']
|
| + c.compile_py.default_targets = []
|
| +
|
| +def _libyuv_static_build(c):
|
| + # TODO(kjellander): Investigate moving this into chromium recipe module's
|
| + # static_library config instead.
|
| + if c.BUILD_CONFIG == 'Debug':
|
| + # GN defaults to component builds for Debug, but some build configurations
|
| + # (Android and iOS) needs it to be static.
|
| + c.gn_args.append('is_component_build=false')
|
|
|