| OLD | NEW |
| 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2011 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 'target_defaults': { | 6 'target_defaults': { |
| 7 'variables': { | 7 'variables': { |
| 8 'chrome_common_target': 0, | 8 'chrome_common_target': 0, |
| 9 }, | 9 }, |
| 10 'target_conditions': [ | 10 'target_conditions': [ |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 78 'common/time_format.h', | 78 'common/time_format.h', |
| 79 'common/win_safe_util.cc', | 79 'common/win_safe_util.cc', |
| 80 'common/win_safe_util.h', | 80 'common/win_safe_util.h', |
| 81 ], | 81 ], |
| 82 }], | 82 }], |
| 83 ], | 83 ], |
| 84 }, | 84 }, |
| 85 'targets': [ | 85 'targets': [ |
| 86 { | 86 { |
| 87 'target_name': 'common', | 87 'target_name': 'common', |
| 88 'type': '<(library)', | 88 'type': 'static_library', |
| 89 'msvs_guid': '899F1280-3441-4D1F-BA04-CCD6208D9146', | 89 'msvs_guid': '899F1280-3441-4D1F-BA04-CCD6208D9146', |
| 90 'variables': { | 90 'variables': { |
| 91 'chrome_common_target': 1, | 91 'chrome_common_target': 1, |
| 92 }, | 92 }, |
| 93 # TODO(gregoryd): This could be shared with the 64-bit target, but | 93 # TODO(gregoryd): This could be shared with the 64-bit target, but |
| 94 # it does not work due to a gyp issue. | 94 # it does not work due to a gyp issue. |
| 95 'direct_dependent_settings': { | 95 'direct_dependent_settings': { |
| 96 'include_dirs': [ | 96 'include_dirs': [ |
| 97 '..', | 97 '..', |
| 98 ], | 98 ], |
| (...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 343 ], | 343 ], |
| 344 }], | 344 }], |
| 345 ], | 345 ], |
| 346 'export_dependent_settings': [ | 346 'export_dependent_settings': [ |
| 347 '../app/app.gyp:app_base', | 347 '../app/app.gyp:app_base', |
| 348 '../base/base.gyp:base', | 348 '../base/base.gyp:base', |
| 349 ], | 349 ], |
| 350 }, | 350 }, |
| 351 { | 351 { |
| 352 'target_name': 'common_net', | 352 'target_name': 'common_net', |
| 353 'type': '<(library)', | 353 'type': 'static_library', |
| 354 'sources': [ | 354 'sources': [ |
| 355 'common/net/http_return.h', | 355 'common/net/http_return.h', |
| 356 'common/net/net_resource_provider.cc', | 356 'common/net/net_resource_provider.cc', |
| 357 'common/net/net_resource_provider.h', | 357 'common/net/net_resource_provider.h', |
| 358 'common/net/predictor_common.h', | 358 'common/net/predictor_common.h', |
| 359 'common/net/url_fetcher.cc', | 359 'common/net/url_fetcher.cc', |
| 360 'common/net/url_fetcher.h', | 360 'common/net/url_fetcher.h', |
| 361 'common/net/gaia/gaia_auth_consumer.cc', | 361 'common/net/gaia/gaia_auth_consumer.cc', |
| 362 'common/net/gaia/gaia_auth_consumer.h', | 362 'common/net/gaia/gaia_auth_consumer.h', |
| 363 'common/net/gaia/gaia_auth_fetcher.cc', | 363 'common/net/gaia/gaia_auth_fetcher.cc', |
| (...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 466 'export_dependent_settings': [ | 466 'export_dependent_settings': [ |
| 467 '../third_party/protobuf/protobuf.gyp:protobuf_lite', | 467 '../third_party/protobuf/protobuf.gyp:protobuf_lite', |
| 468 ], | 468 ], |
| 469 }, | 469 }, |
| 470 ], | 470 ], |
| 471 'conditions': [ | 471 'conditions': [ |
| 472 ['OS=="win"', { | 472 ['OS=="win"', { |
| 473 'targets': [ | 473 'targets': [ |
| 474 { | 474 { |
| 475 'target_name': 'common_nacl_win64', | 475 'target_name': 'common_nacl_win64', |
| 476 'type': '<(library)', | 476 'type': 'static_library', |
| 477 'msvs_guid': '3AB5C5E9-470C-419B-A0AE-C7381FB632FA', | 477 'msvs_guid': '3AB5C5E9-470C-419B-A0AE-C7381FB632FA', |
| 478 'variables': { | 478 'variables': { |
| 479 'chrome_common_target': 1, | 479 'chrome_common_target': 1, |
| 480 }, | 480 }, |
| 481 'dependencies': [ | 481 'dependencies': [ |
| 482 # TODO(gregoryd): chrome_resources and chrome_strings could be | 482 # TODO(gregoryd): chrome_resources and chrome_strings could be |
| 483 # shared with the 32-bit target, but it does not work due to a gyp | 483 # shared with the 32-bit target, but it does not work due to a gyp |
| 484 # issue. | 484 # issue. |
| 485 'chrome_resources', | 485 'chrome_resources', |
| 486 'chrome_strings', | 486 'chrome_strings', |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 532 'configurations': { | 532 'configurations': { |
| 533 'Common_Base': { | 533 'Common_Base': { |
| 534 'msvs_target_platform': 'x64', | 534 'msvs_target_platform': 'x64', |
| 535 }, | 535 }, |
| 536 }, | 536 }, |
| 537 }, | 537 }, |
| 538 ], | 538 ], |
| 539 }], | 539 }], |
| 540 ], | 540 ], |
| 541 } | 541 } |
| OLD | NEW |