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

Side by Side Diff: chrome/chrome_common.gypi

Issue 396463004: Implement NetworkingPrivateCrypto for OpenSSL. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/chrome_tests_unit.gypi » ('j') | chrome/chrome_tests_unit.gypi » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 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 'variables': { 6 'variables': {
7 'chrome_common_sources': [ 7 'chrome_common_sources': [
8 '../apps/app_shim/app_shim_launch.h', 8 '../apps/app_shim/app_shim_launch.h',
9 '../apps/app_shim/app_shim_messages.h', 9 '../apps/app_shim/app_shim_messages.h',
10 'common/all_messages.h', 10 'common/all_messages.h',
(...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after
334 ], 334 ],
335 'dependencies': [ 335 'dependencies': [
336 '../device/bluetooth/bluetooth.gyp:device_bluetooth', 336 '../device/bluetooth/bluetooth.gyp:device_bluetooth',
337 '../device/usb/usb.gyp:device_usb', 337 '../device/usb/usb.gyp:device_usb',
338 ], 338 ],
339 }], 339 }],
340 ['OS=="win" or OS=="mac"', { 340 ['OS=="win" or OS=="mac"', {
341 'sources': [ 341 'sources': [
342 'common/extensions/api/networking_private/networking_private_crypto_ nss.cc', 342 'common/extensions/api/networking_private/networking_private_crypto_ nss.cc',
343 'common/extensions/api/networking_private/networking_private_crypto_ openssl.cc', 343 'common/extensions/api/networking_private/networking_private_crypto_ openssl.cc',
344 'common/extensions/api/networking_private/networking_private_crypto. cc',
344 'common/extensions/api/networking_private/networking_private_crypto. h', 345 'common/extensions/api/networking_private/networking_private_crypto. h',
345 'common/media_galleries/itunes_library.cc', 346 'common/media_galleries/itunes_library.cc',
346 'common/media_galleries/itunes_library.h', 347 'common/media_galleries/itunes_library.h',
347 'common/media_galleries/picasa_types.cc', 348 'common/media_galleries/picasa_types.cc',
348 'common/media_galleries/picasa_types.h', 349 'common/media_galleries/picasa_types.h',
349 'common/media_galleries/pmp_constants.h', 350 'common/media_galleries/pmp_constants.h',
350 ], 351 ],
351 }], 352 }],
353 ['(OS=="win" or OS=="mac") and use_openssl==1', {
354 # networking_private_crypto_openssl.cc depends on openssl.
355 'dependencies': [
356 '../third_party/openssl/openssl.gyp:openssl',
davidben 2014/07/14 20:05:48 Without this it silently includes the system OpenS
357 ],
358 }],
352 ['OS=="mac"', { 359 ['OS=="mac"', {
353 'sources': [ 360 'sources': [
354 'common/media_galleries/iphoto_library.cc', 361 'common/media_galleries/iphoto_library.cc',
355 'common/media_galleries/iphoto_library.h', 362 'common/media_galleries/iphoto_library.h',
356 ], 363 ],
357 }], 364 }],
358 ['OS != "ios"', { 365 ['OS != "ios"', {
359 'dependencies': [ 366 'dependencies': [
360 '<(DEPTH)/chrome/common/extensions/api/api.gyp:chrome_api', 367 '<(DEPTH)/chrome/common/extensions/api/api.gyp:chrome_api',
361 '<(DEPTH)/components/components.gyp:autofill_core_common', 368 '<(DEPTH)/components/components.gyp:autofill_core_common',
(...skipping 326 matching lines...) Expand 10 before | Expand all | Expand 10 after
688 'common/safe_browsing/csd.proto' 695 'common/safe_browsing/csd.proto'
689 ], 696 ],
690 'variables': { 697 'variables': {
691 'proto_in_dir': 'common/safe_browsing', 698 'proto_in_dir': 'common/safe_browsing',
692 'proto_out_dir': 'chrome/common/safe_browsing', 699 'proto_out_dir': 'chrome/common/safe_browsing',
693 }, 700 },
694 'includes': [ '../build/protoc.gypi' ], 701 'includes': [ '../build/protoc.gypi' ],
695 }, 702 },
696 ], 703 ],
697 } 704 }
OLDNEW
« no previous file with comments | « no previous file | chrome/chrome_tests_unit.gypi » ('j') | chrome/chrome_tests_unit.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698