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

Side by Side 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, 1 month 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
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 { 5 {
6 'dependencies': [ 6 'dependencies': [
7 '../base/base.gyp:base_static', 7 '../base/base.gyp:base_static',
8 '../components/url_formatter/url_formatter.gyp:url_formatter', 8 '../components/url_formatter/url_formatter.gyp:url_formatter',
9 '../crypto/crypto.gyp:crypto', 9 '../crypto/crypto.gyp:crypto',
10 '../device/battery/battery.gyp:device_battery', 10 '../device/battery/battery.gyp:device_battery',
11 '../device/battery/battery.gyp:device_battery_mojo_bindings', 11 '../device/battery/battery.gyp:device_battery_mojo_bindings',
12 '../device/vibration/vibration.gyp:device_vibration', 12 '../device/vibration/vibration.gyp:device_vibration',
13 '../device/vibration/vibration.gyp:device_vibration_mojo_bindings', 13 '../device/vibration/vibration.gyp:device_vibration_mojo_bindings',
14 '../google_apis/google_apis.gyp:google_apis', 14 '../google_apis/google_apis.gyp:google_apis',
15 '../mojo/mojo_base.gyp:mojo_application_base', 15 '../mojo/mojo_base.gyp:mojo_application_base',
16 '../mojo/mojo_base.gyp:mojo_geometry_lib', 16 '../mojo/mojo_base.gyp:mojo_geometry_lib',
17 '../mojo/mojo_base.gyp:mojo_url_type_converters', 17 '../mojo/mojo_base.gyp:mojo_url_type_converters',
18 '../mojo/mojo_services.gyp:network_service_bindings_lib', 18 '../mojo/mojo_services.gyp:network_service_bindings_lib',
19 '../mojo/mojo_services.gyp:updater_bindings_lib', 19 '../mojo/mojo_services.gyp:updater_bindings_lib',
20 '../mojo/mojo_shell.gyp:mojo_shell_lib', 20 '../mojo/mojo_shell.gyp:mojo_shell_lib',
21 '../mojo/mojo_shell.gyp:mojo_fetcher_lib', 21 '../mojo/mojo_shell.gyp:mojo_fetcher_lib',
22 '../net/net.gyp:net', 22 '../net/net.gyp:net',
23 '../net/net.gyp:net_extras', 23 '../net/net.gyp:net_extras',
24 '../skia/skia.gyp:skia', 24 '../skia/skia.gyp:skia',
25 '../skia/skia.gyp:skia_mojo', 25 '../skia/skia.gyp:skia_mojo',
26 '../sql/sql.gyp:sql', 26 '../sql/sql.gyp:sql',
27 '../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.
27 '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings', 28 '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
28 '../third_party/re2/re2.gyp:re2', 29 '../third_party/re2/re2.gyp:re2',
29 '../third_party/zlib/google/zip.gyp:zip', 30 '../third_party/zlib/google/zip.gyp:zip',
30 '../third_party/zlib/zlib.gyp:zlib', 31 '../third_party/zlib/zlib.gyp:zlib',
31 '../third_party/WebKit/public/blink_headers.gyp:blink_headers', 32 '../third_party/WebKit/public/blink_headers.gyp:blink_headers',
32 '../ui/accessibility/accessibility.gyp:accessibility', 33 '../ui/accessibility/accessibility.gyp:accessibility',
33 '../ui/accessibility/accessibility.gyp:ax_gen', 34 '../ui/accessibility/accessibility.gyp:ax_gen',
34 '../ui/base/ui_base.gyp:ui_base', 35 '../ui/base/ui_base.gyp:ui_base',
35 '../ui/base/ime/ui_base_ime.gyp:ui_base_ime', 36 '../ui/base/ime/ui_base_ime.gyp:ui_base_ime',
36 '../ui/events/events.gyp:blink', 37 '../ui/events/events.gyp:blink',
(...skipping 2111 matching lines...) Expand 10 before | Expand all | Expand 10 after
2148 }], 2149 }],
2149 ['enable_browser_cdms==1', { 2150 ['enable_browser_cdms==1', {
2150 'sources': [ 2151 'sources': [
2151 'browser/media/cdm/browser_cdm_manager.cc', 2152 'browser/media/cdm/browser_cdm_manager.cc',
2152 'browser/media/cdm/browser_cdm_manager.h', 2153 'browser/media/cdm/browser_cdm_manager.h',
2153 # This works on Android because enable_browser_cdms==1 on Android. 2154 # This works on Android because enable_browser_cdms==1 on Android.
2154 'browser/media/media_web_contents_observer.cc', 2155 'browser/media/media_web_contents_observer.cc',
2155 'browser/media/media_web_contents_observer.h', 2156 'browser/media/media_web_contents_observer.h',
2156 ], 2157 ],
2157 }], 2158 }],
2158 ['OS == "linux"', {
2159 'dependencies': [
2160 '../third_party/boringssl/boringssl.gyp:boringssl',
2161 ],
2162 }],
2163 ['enable_webvr==1', { 2159 ['enable_webvr==1', {
2164 'sources': [ 2160 'sources': [
2165 'browser/vr/vr_device.cc', 2161 'browser/vr/vr_device.cc',
2166 'browser/vr/vr_device.h', 2162 'browser/vr/vr_device.h',
2167 'browser/vr/vr_device_manager.cc', 2163 'browser/vr/vr_device_manager.cc',
2168 'browser/vr/vr_device_manager.h', 2164 'browser/vr/vr_device_manager.h',
2169 'browser/vr/vr_device_provider.h', 2165 'browser/vr/vr_device_provider.h',
2170 ] 2166 ]
2171 }], 2167 }],
2172 ['enable_webvr==1 and OS=="android"', { 2168 ['enable_webvr==1 and OS=="android"', {
2173 'sources': [ 2169 'sources': [
2174 'browser/vr/android/cardboard/cardboard_vr_device.cc', 2170 'browser/vr/android/cardboard/cardboard_vr_device.cc',
2175 'browser/vr/android/cardboard/cardboard_vr_device.h', 2171 'browser/vr/android/cardboard/cardboard_vr_device.h',
2176 'browser/vr/android/cardboard/cardboard_vr_device_provider.cc', 2172 'browser/vr/android/cardboard/cardboard_vr_device_provider.cc',
2177 'browser/vr/android/cardboard/cardboard_vr_device_provider.h', 2173 'browser/vr/android/cardboard/cardboard_vr_device_provider.h',
2178 ], 2174 ],
2179 }], 2175 }],
2180 ], 2176 ],
2181 } 2177 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698