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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/content_browser.gypi

Issue 1422573008: Plumbing SSLPrivateKey (//net) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixing extra tab. Created 5 years, 2 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 side-by-side diff with in-line comments
Download patch
« content/browser/loader/resource_loader_unittest.cc ('K') | « content/browser/loader/resource_loader_unittest.cc ('k') | content/content_tests.gypi » ('j') | content/content_tests.gypi » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_browser.gypi
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index b000f21bac67466018418c9397731788cd7b3aa2..762cdef734cc0bd0cae75fc0c863900714af0eaf 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -24,6 +24,7 @@
'../skia/skia.gyp:skia',
'../skia/skia.gyp:skia_mojo',
'../sql/sql.gyp:sql',
+ '../third_party/boringssl/boringssl.gyp:boringssl',
davidben 2015/11/04 00:17:38 Not necessary? (See net/ssl/ssl_platform_key.h com
svaldez 2015/11/04 16:55:51 Done.
'../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
'../third_party/re2/re2.gyp:re2',
'../third_party/zlib/google/zip.gyp:zip',
@@ -2155,11 +2156,6 @@
'browser/media/media_web_contents_observer.h',
],
}],
- ['OS == "linux"', {
- 'dependencies': [
- '../third_party/boringssl/boringssl.gyp:boringssl',
- ],
- }],
['enable_webvr==1', {
'sources': [
'browser/vr/vr_device.cc',
« content/browser/loader/resource_loader_unittest.cc ('K') | « content/browser/loader/resource_loader_unittest.cc ('k') | content/content_tests.gypi » ('j') | content/content_tests.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698