| OLD | NEW | 
|---|
| 1 # Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. | 1 # Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. | 
| 2 # | 2 # | 
| 3 # Use of this source code is governed by a BSD-style license | 3 # Use of this source code is governed by a BSD-style license | 
| 4 # that can be found in the LICENSE file in the root of the source | 4 # that can be found in the LICENSE file in the root of the source | 
| 5 # tree. An additional intellectual property rights grant can be found | 5 # tree. An additional intellectual property rights grant can be found | 
| 6 # in the file PATENTS.  All contributing project authors may | 6 # in the file PATENTS.  All contributing project authors may | 
| 7 # be found in the AUTHORS file in the root of the source tree. | 7 # be found in the AUTHORS file in the root of the source tree. | 
| 8 | 8 | 
| 9 import("../../build/webrtc.gni") | 9 import("../../build/webrtc.gni") | 
| 10 | 10 | 
| (...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 129 | 129 | 
| 130   if (is_clang) { | 130   if (is_clang) { | 
| 131     # Suppress warnings from Chrome's Clang plugins. | 131     # Suppress warnings from Chrome's Clang plugins. | 
| 132     # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 132     # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 
| 133     configs -= [ "//build/config/clang:find_bad_constructs" ] | 133     configs -= [ "//build/config/clang:find_bad_constructs" ] | 
| 134   } | 134   } | 
| 135 | 135 | 
| 136   deps = [ | 136   deps = [ | 
| 137     "../../system_wrappers", | 137     "../../system_wrappers", | 
| 138   ] | 138   ] | 
|  | 139 | 
|  | 140   if (use_third_party_h264) { | 
|  | 141     # Dependency added so that variables use_openh264 and ffmpeg_branding are | 
|  | 142     # recognized build arguments (avoid "Build argument has no effect" error). | 
|  | 143     # The variables and dependencies will be used for real as soon as | 
|  | 144     # https://codereview.webrtc.org/1306813009/ lands. In the meantime, the | 
|  | 145     # build arguments are to be used by waterfall/trybots. | 
|  | 146     deps += [ | 
|  | 147       "//third_party/ffmpeg:ffmpeg", | 
|  | 148       "//third_party/openh264:encoder", | 
|  | 149     ] | 
|  | 150   } | 
| 139 } | 151 } | 
| 140 | 152 | 
| 141 # TODO(tkchin): Source set for webrtc_h264_video_toolbox. Currently not | 153 # TODO(tkchin): Source set for webrtc_h264_video_toolbox. Currently not | 
| 142 # possible to add, see https://crbug.com/297668. | 154 # possible to add, see https://crbug.com/297668. | 
| 143 | 155 | 
| 144 source_set("webrtc_i420") { | 156 source_set("webrtc_i420") { | 
| 145   sources = [ | 157   sources = [ | 
| 146     "codecs/i420/i420.cc", | 158     "codecs/i420/i420.cc", | 
| 147     "codecs/i420/include/i420.h", | 159     "codecs/i420/include/i420.h", | 
| 148   ] | 160   ] | 
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 230 | 242 | 
| 231   deps = [ | 243   deps = [ | 
| 232     ":video_coding_utility", | 244     ":video_coding_utility", | 
| 233     "../../common_video", | 245     "../../common_video", | 
| 234     "../../system_wrappers", | 246     "../../system_wrappers", | 
| 235   ] | 247   ] | 
| 236   if (rtc_build_libvpx) { | 248   if (rtc_build_libvpx) { | 
| 237     deps += [ rtc_libvpx_dir ] | 249     deps += [ rtc_libvpx_dir ] | 
| 238   } | 250   } | 
| 239 } | 251 } | 
| OLD | NEW | 
|---|