From c3091a6c26dc9b9cc076ddd96de2be57dbd8d8af Mon Sep 17 00:00:00 2001 From: "pbos@webrtc.org" Date: Thu, 18 Sep 2014 17:22:18 +0000 Subject: [PATCH] Remove the 'webrtc_test_video_render_dependencies' target. This target is no longer needed and is causing linking errors on XCode. R=andresp@webrtc.org, pbos@webrtc.org Review URL: https://webrtc-codereview.appspot.com/28519004 Patch from Alexandre Gouaillard . git-svn-id: http://webrtc.googlecode.com/svn/trunk@7226 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/test/webrtc_test_common.gyp | 33 ------------------------------ webrtc/webrtc_tests.gypi | 2 -- 2 files changed, 35 deletions(-) diff --git a/webrtc/test/webrtc_test_common.gyp b/webrtc/test/webrtc_test_common.gyp index 98b95774eb..71b875d1ba 100644 --- a/webrtc/test/webrtc_test_common.gyp +++ b/webrtc/test/webrtc_test_common.gyp @@ -157,39 +157,6 @@ ], }, }, - { - # This target is only needed since the video render module builds platform - # specific code and depends on these libraries. This target should be - # removed as soon as the new video API doesn't depend on the module. - # TODO(mflodman) Remove this target as described above. - 'target_name': 'webrtc_test_video_render_dependencies', - 'type': 'static_library', - 'direct_dependent_settings': { - 'conditions': [ - ['OS=="linux"', { - 'libraries': [ - '-lXext', - '-lX11', - '-lGL', - ], - }], - ['OS=="android"', { - 'libraries' : [ - '-lGLESv2', '-llog', - ], - }], - ['OS=="mac"', { - 'xcode_settings' : { - 'OTHER_LDFLAGS' : [ - '-framework Cocoa', - '-framework OpenGL', - '-framework CoreVideo', - ], - }, - }], - ], - }, - }, ], 'conditions': [ ['include_tests==1', { diff --git a/webrtc/webrtc_tests.gypi b/webrtc/webrtc_tests.gypi index 833fef9f50..1d862c654b 100644 --- a/webrtc/webrtc_tests.gypi +++ b/webrtc/webrtc_tests.gypi @@ -97,7 +97,6 @@ 'test/metrics.gyp:metrics', 'test/webrtc_test_common.gyp:webrtc_test_common', 'test/test.gyp:test_main', - 'test/webrtc_test_common.gyp:webrtc_test_video_render_dependencies', 'webrtc', ], 'conditions': [ @@ -124,7 +123,6 @@ 'modules/modules.gyp:rtp_rtcp', 'test/webrtc_test_common.gyp:webrtc_test_common', 'test/test.gyp:test_main', - 'test/webrtc_test_common.gyp:webrtc_test_video_render_dependencies', 'webrtc', ], 'conditions': [