Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(344)

Side by Side Diff: webrtc/BUILD.gn

Issue 1184763009: Merge video_engine_core into webrtc target. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | webrtc/base/base.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 # TODO(kjellander): Rebase this to webrtc/build/common.gypi changes after r6330. 9 # TODO(kjellander): Rebase this to webrtc/build/common.gypi changes after r6330.
10 10
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 "modules/bitrate_controller", 188 "modules/bitrate_controller",
189 "modules/desktop_capture", 189 "modules/desktop_capture",
190 "modules/media_file", 190 "modules/media_file",
191 "modules/rtp_rtcp", 191 "modules/rtp_rtcp",
192 "modules/utility", 192 "modules/utility",
193 "modules/video_coding", 193 "modules/video_coding",
194 "modules/video_processing", 194 "modules/video_processing",
195 "system_wrappers", 195 "system_wrappers",
196 "tools", 196 "tools",
197 "video", 197 "video",
198 "video_engine",
199 "voice_engine", 198 "voice_engine",
200 ] 199 ]
201 200
202 if (build_with_chromium) { 201 if (build_with_chromium) {
203 deps += [ 202 deps += [
204 "modules/video_capture", 203 "modules/video_capture",
205 "modules/video_render", 204 "modules/video_render",
206 ] 205 ]
207 } 206 }
208 } 207 }
(...skipping 22 matching lines...) Expand all
231 230
232 configs += [ ":common_config" ] 231 configs += [ ":common_config" ]
233 public_configs = [ ":common_inherited_config" ] 232 public_configs = [ ":common_inherited_config" ]
234 } 233 }
235 234
236 source_set("gtest_prod") { 235 source_set("gtest_prod") {
237 sources = [ 236 sources = [
238 "test/testsupport/gtest_prod_util.h", 237 "test/testsupport/gtest_prod_util.h",
239 ] 238 ]
240 } 239 }
OLDNEW
« no previous file with comments | « no previous file | webrtc/base/base.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698