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

Side by Side Diff: chrome/chrome_common.gypi

Issue 58543003: gyp: Put back common dependency on api, because the hard_dependency property isn't transitive. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: , Created 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
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 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'common', 8 'target_name': 'common',
9 'type': 'static_library', 9 'type': 'static_library',
10 'variables': { 10 'variables': {
(...skipping 395 matching lines...) Expand 10 before | Expand all | Expand 10 after
406 '../components/nacl/common/nacl_host_messages.h', 406 '../components/nacl/common/nacl_host_messages.h',
407 '../components/nacl/common/nacl_process_type.h', 407 '../components/nacl/common/nacl_process_type.h',
408 '../components/nacl/common/nacl_sandbox_type_mac.h', 408 '../components/nacl/common/nacl_sandbox_type_mac.h',
409 '../components/nacl/common/pnacl_types.cc', 409 '../components/nacl/common/pnacl_types.cc',
410 '../components/nacl/common/pnacl_types.h', 410 '../components/nacl/common/pnacl_types.h',
411 ], 411 ],
412 'conditions': [ 412 'conditions': [
413 ['enable_extensions==1', { 413 ['enable_extensions==1', {
414 'dependencies': [ 414 'dependencies': [
415 '../device/bluetooth/bluetooth.gyp:device_bluetooth', 415 '../device/bluetooth/bluetooth.gyp:device_bluetooth',
416 '../device/usb/usb.gyp:device_usb', 416 '../device/usb/usb.gyp:device_usb',
not at google - send to devlin 2013/11/05 01:07:25 seems like it should go in here, but I'm not confi
Yoyo Zhou 2013/11/05 01:10:55 Well, it was removed from the OS != "ios" section,
417 ], 417 ],
418 }, { # enable_extensions == 0 418 }, { # enable_extensions == 0
419 'sources/': [ 419 'sources/': [
420 ['exclude', '^common/extensions/api/'], 420 ['exclude', '^common/extensions/api/'],
421 ['include', 'common/extensions/api/extension_action/action_info.cc'] , 421 ['include', 'common/extensions/api/extension_action/action_info.cc'] ,
422 ['include', 'common/extensions/api/extension_action/action_info.h'], 422 ['include', 'common/extensions/api/extension_action/action_info.h'],
423 ['include', 'common/extensions/api/i18n/default_locale_handler.cc'], 423 ['include', 'common/extensions/api/i18n/default_locale_handler.cc'],
424 ['include', 'common/extensions/api/i18n/default_locale_handler.h'], 424 ['include', 'common/extensions/api/i18n/default_locale_handler.h'],
425 ['include', 'common/extensions/api/identity/oauth2_manifest_handler. cc'], 425 ['include', 'common/extensions/api/identity/oauth2_manifest_handler. cc'],
426 ['include', 'common/extensions/api/identity/oauth2_manifest_handler. h'], 426 ['include', 'common/extensions/api/identity/oauth2_manifest_handler. h'],
(...skipping 16 matching lines...) Expand all
443 }], 443 }],
444 ['OS=="mac"', { 444 ['OS=="mac"', {
445 'sources': [ 445 'sources': [
446 'common/media_galleries/iphoto_library.cc', 446 'common/media_galleries/iphoto_library.cc',
447 'common/media_galleries/iphoto_library.h', 447 'common/media_galleries/iphoto_library.h',
448 ], 448 ],
449 }], 449 }],
450 ['OS != "ios"', { 450 ['OS != "ios"', {
451 'dependencies': [ 451 'dependencies': [
452 '<(DEPTH)/chrome/app/policy/cloud_policy_codegen.gyp:policy', 452 '<(DEPTH)/chrome/app/policy/cloud_policy_codegen.gyp:policy',
453 '<(DEPTH)/chrome/common/extensions/api/api.gyp:api',
453 '<(DEPTH)/components/components.gyp:autofill_core_common', 454 '<(DEPTH)/components/components.gyp:autofill_core_common',
454 '<(DEPTH)/components/nacl_common.gyp:nacl_common', 455 '<(DEPTH)/components/nacl_common.gyp:nacl_common',
455 '<(DEPTH)/ipc/ipc.gyp:ipc', 456 '<(DEPTH)/ipc/ipc.gyp:ipc',
456 '<(DEPTH)/printing/printing.gyp:printing', 457 '<(DEPTH)/printing/printing.gyp:printing',
457 '<(DEPTH)/third_party/adobe/flash/flash_player.gyp:flapper_version_h ', 458 '<(DEPTH)/third_party/adobe/flash/flash_player.gyp:flapper_version_h ',
458 '<(DEPTH)/third_party/re2/re2.gyp:re2', 459 '<(DEPTH)/third_party/re2/re2.gyp:re2',
459 '<(DEPTH)/third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_ver sion_h', 460 '<(DEPTH)/third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_ver sion_h',
460 ], 461 ],
461 }, { # OS == ios 462 }, { # OS == ios
462 'sources/': [ 463 'sources/': [
(...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after
778 'common/metrics/proto/user_action_event.proto', 779 'common/metrics/proto/user_action_event.proto',
779 ], 780 ],
780 'variables': { 781 'variables': {
781 'proto_in_dir': 'common/metrics/proto', 782 'proto_in_dir': 'common/metrics/proto',
782 'proto_out_dir': 'chrome/common/metrics/proto', 783 'proto_out_dir': 'chrome/common/metrics/proto',
783 }, 784 },
784 'includes': [ '../build/protoc.gypi' ], 785 'includes': [ '../build/protoc.gypi' ],
785 }, 786 },
786 ], 787 ],
787 } 788 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698