admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iOS: Include legacy objc API in all.gyp + fix H264 libyuv dependency

Browse Source 
The legacy objc API is not included in the GYP generation if include_tests=0.
This causes problems downstream in some cases, so it's changed in this CL.

The libyuv dependency needs to be possible to disable using the build_libyuv
GYP variable.

NOTRY=True

Review URL: https://codereview.webrtc.org/1705733002

Cr-Commit-Position: refs/heads/master@{#11652}
This commit is contained in:
kjellander 2016-02-17 05:38:29 -08:00 committed by Commit bot
parent 4b4dc86c61
commit 28c99bc44a
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
all.gyp
View File

@ -26,9 +26,16 @@
'webrtc/webrtc_examples.gyp:*', 'webrtc/webrtc_examples.gyp:*',
], ],
}], }],
['(OS=="ios" or (OS=="mac" and target_arch!="ia32")) and include_tests==1', { ['OS=="ios" or (OS=="mac" and target_arch!="ia32")', {
'dependencies': [ 'dependencies': [
'talk/app/webrtc/legacy_objc_api_tests.gyp:*', 'talk/app/webrtc/legacy_objc_api.gyp:*',
],
'conditions': [
['include_tests==1', {
'dependencies': [
'talk/app/webrtc/legacy_objc_api_tests.gyp:*',
],
}],
], ],
}], }],
], ],

8
webrtc/modules/video_coding/codecs/h264/h264.gypi
View File

@ -62,9 +62,6 @@
{ {
'target_name': 'webrtc_h264_video_toolbox', 'target_name': 'webrtc_h264_video_toolbox',
'type': 'static_library', 'type': 'static_library',
'dependencies': [
'<(DEPTH)/third_party/libyuv/libyuv.gyp:libyuv',
],
'link_settings': { 'link_settings': {
'xcode_settings': { 'xcode_settings': {
'OTHER_LDFLAGS': [ 'OTHER_LDFLAGS': [
@ -83,6 +80,11 @@
'h264_video_toolbox_nalu.cc', 'h264_video_toolbox_nalu.cc',
'h264_video_toolbox_nalu.h', 'h264_video_toolbox_nalu.h',
], ],
'conditions': [
['build_libyuv==1', {
'dependencies': ['<(DEPTH)/third_party/libyuv/libyuv.gyp:libyuv'],
}],
],
}, # webrtc_h264_video_toolbox }, # webrtc_h264_video_toolbox
], # targets ], # targets
}], # OS=="ios" }], # OS=="ios"