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

Side by Side Diff: chrome/chrome_common.gypi

Issue 792353002: Refactoring of Cast-related crypto code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixes in response to comments by mfoltz Created 5 years, 11 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
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 # File lists shared with GN build. 7 # File lists shared with GN build.
8 'chrome_common_sources': [ 8 'chrome_common_sources': [
9 'common/all_messages.h', 9 'common/all_messages.h',
10 'common/attrition_experiments.h', 10 'common/attrition_experiments.h',
(...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
245 'common/service_messages.h', 245 'common/service_messages.h',
246 'common/service_process_util.cc', 246 'common/service_process_util.cc',
247 'common/service_process_util.h', 247 'common/service_process_util.h',
248 'common/service_process_util_linux.cc', 248 'common/service_process_util_linux.cc',
249 'common/service_process_util_mac.mm', 249 'common/service_process_util_mac.mm',
250 'common/service_process_util_posix.cc', 250 'common/service_process_util_posix.cc',
251 'common/service_process_util_posix.h', 251 'common/service_process_util_posix.h',
252 'common/service_process_util_win.cc', 252 'common/service_process_util_win.cc',
253 ], 253 ],
254 'chrome_common_win_mac_sources': [ 254 'chrome_common_win_mac_sources': [
255 'common/extensions/api/networking_private/networking_private_crypto_nss.cc ',
256 'common/extensions/api/networking_private/networking_private_crypto_openss l.cc',
257 'common/extensions/api/networking_private/networking_private_crypto.cc',
258 'common/extensions/api/networking_private/networking_private_crypto.h',
259 'common/media_galleries/itunes_library.cc', 255 'common/media_galleries/itunes_library.cc',
260 'common/media_galleries/itunes_library.h', 256 'common/media_galleries/itunes_library.h',
261 'common/media_galleries/picasa_types.cc', 257 'common/media_galleries/picasa_types.cc',
262 'common/media_galleries/picasa_types.h', 258 'common/media_galleries/picasa_types.h',
263 'common/media_galleries/pmp_constants.h', 259 'common/media_galleries/pmp_constants.h',
264 ], 260 ],
261 'chrome_common_networking_private_sources_openssl' : [
262 'common/extensions/api/networking_private/networking_private_crypto_openss l.cc',
263 'common/extensions/api/networking_private/networking_private_crypto.cc',
264 'common/extensions/api/networking_private/networking_private_crypto.h',
265 ],
266 'chrome_common_networking_private_sources_nss' : [
267 'common/extensions/api/networking_private/networking_private_crypto_nss.cc ',
268 'common/extensions/api/networking_private/networking_private_crypto.cc',
269 'common/extensions/api/networking_private/networking_private_crypto.h',
270 ],
271
265 'chrome_common_mac_sources': [ 272 'chrome_common_mac_sources': [
266 'common/media_galleries/iphoto_library.cc', 273 'common/media_galleries/iphoto_library.cc',
267 'common/media_galleries/iphoto_library.h', 274 'common/media_galleries/iphoto_library.h',
268 ] 275 ]
269 }, 276 },
270 'targets': [ 277 'targets': [
271 { 278 {
272 # GN: //chrome/common:common 279 # GN: //chrome/common:common
273 'target_name': 'common', 280 'target_name': 'common',
274 'type': 'static_library', 281 'type': 'static_library',
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
336 '<(DEPTH)/extensions/extensions_resources.gyp:extensions_resources', 343 '<(DEPTH)/extensions/extensions_resources.gyp:extensions_resources',
337 '<(DEPTH)/extensions/extensions_strings.gyp:extensions_strings', 344 '<(DEPTH)/extensions/extensions_strings.gyp:extensions_strings',
338 ], 345 ],
339 'export_dependent_settings': [ 346 'export_dependent_settings': [
340 '<(DEPTH)/chrome/common/extensions/api/api.gyp:chrome_api', 347 '<(DEPTH)/chrome/common/extensions/api/api.gyp:chrome_api',
341 ], 348 ],
342 }], 349 }],
343 ['OS=="win" or OS=="mac"', { 350 ['OS=="win" or OS=="mac"', {
344 'sources': [ '<@(chrome_common_win_mac_sources)' ], 351 'sources': [ '<@(chrome_common_win_mac_sources)' ],
345 }], 352 }],
346 ['(OS=="win" or OS=="mac") and use_openssl==1', { 353 ['(OS=="win" or OS=="mac" or chromeos==1) and use_openssl==1', {
347 # networking_private_crypto_openssl.cc depends on boringssl. 354 'sources': [ '<@(chrome_common_networking_private_sources_openssl)' ],
348 'dependencies': [ 355 'dependencies': [
349 '../third_party/boringssl/boringssl.gyp:boringssl', 356 '../third_party/boringssl/boringssl.gyp:boringssl',
350 ], 357 ],
351 }], 358 }],
359 ['(OS=="win" or OS=="mac" or chromeos==1) and use_openssl!=1', {
360 'sources': [ '<@(chrome_common_networking_private_sources_nss)' ],
361 }],
352 ['OS=="mac"', { 362 ['OS=="mac"', {
353 'sources': [ '<@(chrome_common_mac_sources)' ], 363 'sources': [ '<@(chrome_common_mac_sources)' ],
354 }], 364 }],
355 ['OS != "ios"', { 365 ['OS != "ios"', {
356 'dependencies': [ 366 'dependencies': [
357 '<(DEPTH)/components/components.gyp:autofill_core_common', 367 '<(DEPTH)/components/components.gyp:autofill_core_common',
358 '<(DEPTH)/components/components.gyp:autofill_content_common', 368 '<(DEPTH)/components/components.gyp:autofill_content_common',
359 '<(DEPTH)/components/components.gyp:password_manager_core_common', 369 '<(DEPTH)/components/components.gyp:password_manager_core_common',
360 '<(DEPTH)/components/components.gyp:password_manager_content_common' , 370 '<(DEPTH)/components/components.gyp:password_manager_content_common' ,
361 '<(DEPTH)/components/components.gyp:signin_core_common', 371 '<(DEPTH)/components/components.gyp:signin_core_common',
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
490 '<(DEPTH)/components/components.gyp:policy', 500 '<(DEPTH)/components/components.gyp:policy',
491 ], 501 ],
492 }], 502 }],
493 ['safe_browsing==1', { 503 ['safe_browsing==1', {
494 'defines': [ 'FULL_SAFE_BROWSING' ], 504 'defines': [ 'FULL_SAFE_BROWSING' ],
495 'sources': [ '<@(chrome_common_full_safe_browsing_sources)', ], 505 'sources': [ '<@(chrome_common_full_safe_browsing_sources)', ],
496 }], 506 }],
497 ['safe_browsing==2', { 507 ['safe_browsing==2', {
498 'defines': [ 'MOBILE_SAFE_BROWSING' ], 508 'defines': [ 'MOBILE_SAFE_BROWSING' ],
499 }], 509 }],
500 ['use_openssl==1', {
501 'sources!': [
502 'common/extensions/api/networking_private/networking_private_crypto _nss.cc',
503 ],
504 },
505 { # else !use_openssl
506 'sources!': [
507 'common/extensions/api/networking_private/networking_private_crypto _openssl.cc',
508 ],
509 },
510 ],
511 ], 510 ],
512 'target_conditions': [ 511 'target_conditions': [
513 ['OS == "ios"', { 512 ['OS == "ios"', {
514 'sources/': [ 513 'sources/': [
515 # Pull in specific Mac files for iOS (which have been filtered out 514 # Pull in specific Mac files for iOS (which have been filtered out
516 # by file name rules). 515 # by file name rules).
517 ['include', '^common/chrome_version_info_mac\\.mm$'], 516 ['include', '^common/chrome_version_info_mac\\.mm$'],
518 ], 517 ],
519 }], 518 }],
520 ], 519 ],
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
673 'common/safe_browsing/csd.proto' 672 'common/safe_browsing/csd.proto'
674 ], 673 ],
675 'variables': { 674 'variables': {
676 'proto_in_dir': 'common/safe_browsing', 675 'proto_in_dir': 'common/safe_browsing',
677 'proto_out_dir': 'chrome/common/safe_browsing', 676 'proto_out_dir': 'chrome/common/safe_browsing',
678 }, 677 },
679 'includes': [ '../build/protoc.gypi' ], 678 'includes': [ '../build/protoc.gypi' ],
680 }, 679 },
681 ], 680 ],
682 } 681 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698