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

Side by Side Diff: content/browser/BUILD.gn

Issue 1834163002: Revert of Remove libpeerconnection target from third_party/libjingle (Closed) Base URL: http://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 | content/content_renderer.gypi » ('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 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import("//build/config/features.gni") 5 import("//build/config/features.gni")
6 import("//build/config/ui.gni") 6 import("//build/config/ui.gni")
7 import("//content/browser/browser.gni") 7 import("//content/browser/browser.gni")
8 import("//media/media_options.gni") 8 import("//media/media_options.gni")
9 import("//mojo/public/mojo_application_manifest.gni") 9 import("//mojo/public/mojo_application_manifest.gni")
10 10
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 ] 187 ]
188 } 188 }
189 189
190 if (enable_webrtc) { 190 if (enable_webrtc) {
191 sources += rebase_path(content_browser_gypi_values.webrtc_browser_sources, 191 sources += rebase_path(content_browser_gypi_values.webrtc_browser_sources,
192 ".", 192 ".",
193 "//content") 193 "//content")
194 deps += [ 194 deps += [
195 "//jingle:jingle_glue", 195 "//jingle:jingle_glue",
196 "//third_party/libjingle:libjingle_webrtc", 196 "//third_party/libjingle:libjingle_webrtc",
197 "//third_party/libjingle:libpeerconnection",
197 ] 198 ]
198 if (is_linux || is_mac || is_win) { 199 if (is_linux || is_mac || is_win) {
199 sources += [ 200 sources += [
200 "media/capture/desktop_capture_device.cc", 201 "media/capture/desktop_capture_device.cc",
201 "media/capture/desktop_capture_device.h", 202 "media/capture/desktop_capture_device.h",
202 "media/capture/desktop_capture_device_uma_types.cc", 203 "media/capture/desktop_capture_device_uma_types.cc",
203 "media/capture/desktop_capture_device_uma_types.h", 204 "media/capture/desktop_capture_device_uma_types.h",
204 ] 205 ]
205 if (use_aura) { 206 if (use_aura) {
206 sources += [ 207 sources += [
(...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after
542 type = "exe" 543 type = "exe"
543 application_name = "chrome" 544 application_name = "chrome"
544 source = "mojo/chrome_manifest.json" 545 source = "mojo/chrome_manifest.json"
545 } 546 }
546 547
547 mojo_application_manifest("chrome_renderer_manifest") { 548 mojo_application_manifest("chrome_renderer_manifest") {
548 type = "exe" 549 type = "exe"
549 application_name = "chrome_renderer" 550 application_name = "chrome_renderer"
550 source = "mojo/chrome_renderer_manifest.json" 551 source = "mojo/chrome_renderer_manifest.json"
551 } 552 }
OLDNEW
« no previous file with comments | « no previous file | content/content_renderer.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698