Chromium Code Reviews| 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 'variables': { | 6 'variables': { |
| 7 'chromium_code': 1, | 7 'chromium_code': 1, |
| 8 | 8 |
| 9 'variables': { | 9 'variables': { |
| 10 'version_py_path': '../tools/build/version.py', | 10 'version_py_path': '../tools/build/version.py', |
| (...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 254 'test/url_request_test.cc', | 254 'test/url_request_test.cc', |
| 255 'test/win_event_receiver.cc', | 255 'test/win_event_receiver.cc', |
| 256 'test/win_event_receiver.h', | 256 'test/win_event_receiver.h', |
| 257 'chrome_launcher_version.rc', | 257 'chrome_launcher_version.rc', |
| 258 '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h', | 258 '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h', |
| 259 'test_utils.cc', | 259 'test_utils.cc', |
| 260 'test_utils.h', | 260 'test_utils.h', |
| 261 ], | 261 ], |
| 262 'include_dirs': [ | 262 'include_dirs': [ |
| 263 '<(DEPTH)/third_party/wtl/include', | 263 '<(DEPTH)/third_party/wtl/include', |
| 264 '<(DEPTH)/breakpad/src', | |
| 264 ], | 265 ], |
| 265 'resource_include_dirs': [ | 266 'resource_include_dirs': [ |
| 266 '<(INTERMEDIATE_DIR)', | 267 '<(INTERMEDIATE_DIR)', |
| 267 ], | 268 ], |
| 268 'conditions': [ | 269 'conditions': [ |
| 269 ['OS=="win"', { | 270 ['OS=="win"', { |
| 270 'link_settings': { | 271 'link_settings': { |
| 271 'libraries': [ | 272 'libraries': [ |
| 272 '-loleacc.lib', | 273 '-loleacc.lib', |
| 273 ], | 274 ], |
| (...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 393 '../net/net.gyp:net_test_support', | 394 '../net/net.gyp:net_test_support', |
| 394 '../skia/skia.gyp:skia', | 395 '../skia/skia.gyp:skia', |
| 395 '../testing/gtest.gyp:gtest', | 396 '../testing/gtest.gyp:gtest', |
| 396 '../third_party/icu/icu.gyp:icui18n', | 397 '../third_party/icu/icu.gyp:icui18n', |
| 397 '../third_party/icu/icu.gyp:icuuc', | 398 '../third_party/icu/icu.gyp:icuuc', |
| 398 'chrome_frame_npapi', | 399 'chrome_frame_npapi', |
| 399 'chrome_frame_ie', | 400 'chrome_frame_ie', |
| 400 'chrome_tab_idl', | 401 'chrome_tab_idl', |
| 401 'npchrome_frame', | 402 'npchrome_frame', |
| 402 ], | 403 ], |
| 404 'include_dirs': [ | |
| 405 '../breakpad/src', | |
|
grt (UTC plus 2)
2011/06/22 14:15:01
would <(DEPTH) work here and elsewhere?
robertshield
2011/06/23 02:22:51
done here. Unsure about changing it for the rest o
| |
| 406 ], | |
| 403 'sources': [ | 407 'sources': [ |
| 404 '../net/url_request/url_request_unittest.cc', | 408 '../net/url_request/url_request_unittest.cc', |
| 405 'test/chrome_frame_test_utils.cc', | 409 'test/chrome_frame_test_utils.cc', |
| 406 'test/chrome_frame_test_utils.h', | 410 'test/chrome_frame_test_utils.h', |
| 407 'test/simulate_input.cc', | 411 'test/simulate_input.cc', |
| 408 'test/simulate_input.h', | 412 'test/simulate_input.h', |
| 409 'test/test_server.cc', | 413 'test/test_server.cc', |
| 410 'test/test_server.h', | 414 'test/test_server.h', |
| 411 'test/win_event_receiver.cc', | 415 'test/win_event_receiver.cc', |
| 412 'test/win_event_receiver.h', | 416 'test/win_event_receiver.h', |
| (...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 567 'test/win_event_receiver.cc', | 571 'test/win_event_receiver.cc', |
| 568 'test/win_event_receiver.h', | 572 'test/win_event_receiver.h', |
| 569 '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h', | 573 '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h', |
| 570 'chrome_tab.idl', | 574 'chrome_tab.idl', |
| 571 'renderer_glue.cc', | 575 'renderer_glue.cc', |
| 572 'test_utils.cc', | 576 'test_utils.cc', |
| 573 'test_utils.h', | 577 'test_utils.h', |
| 574 ], | 578 ], |
| 575 'include_dirs': [ | 579 'include_dirs': [ |
| 576 '<(DEPTH)/third_party/wtl/include', | 580 '<(DEPTH)/third_party/wtl/include', |
| 581 '<(DEPTH)/breakpad/src', | |
| 577 # To allow including "chrome_tab.h" | 582 # To allow including "chrome_tab.h" |
| 578 '<(INTERMEDIATE_DIR)', | 583 '<(INTERMEDIATE_DIR)', |
| 579 ], | 584 ], |
| 580 'resource_include_dirs': [ | 585 'resource_include_dirs': [ |
| 581 '<(INTERMEDIATE_DIR)', | 586 '<(INTERMEDIATE_DIR)', |
| 582 ], | 587 ], |
| 583 'conditions': [ | 588 'conditions': [ |
| 584 ['OS=="win"', { | 589 ['OS=="win"', { |
| 585 'link_settings': { | 590 'link_settings': { |
| 586 'libraries': [ | 591 'libraries': [ |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 642 'grit_grd_file': 'resources/chrome_frame_resources.grd', | 647 'grit_grd_file': 'resources/chrome_frame_resources.grd', |
| 643 }, | 648 }, |
| 644 'includes': [ '../build/grit_action.gypi' ], | 649 'includes': [ '../build/grit_action.gypi' ], |
| 645 }, | 650 }, |
| 646 ], | 651 ], |
| 647 'includes': [ '../build/grit_target.gypi' ], | 652 'includes': [ '../build/grit_target.gypi' ], |
| 648 }, | 653 }, |
| 649 { | 654 { |
| 650 'target_name': 'chrome_frame_utils', | 655 'target_name': 'chrome_frame_utils', |
| 651 # The intent is that shared util code can be built into a separate lib. | 656 # The intent is that shared util code can be built into a separate lib. |
| 652 # Currently on the resource loading code is here. | |
| 653 'type': 'static_library', | 657 'type': 'static_library', |
| 654 'dependencies': [ | 658 'dependencies': [ |
| 655 '../base/base.gyp:base_i18n', | 659 '../base/base.gyp:base_i18n', |
| 656 '../breakpad/breakpad.gyp:breakpad_handler', | 660 '../breakpad/breakpad.gyp:breakpad_handler', |
| 657 '../chrome/chrome.gyp:chrome_version_header', | 661 '../chrome/chrome.gyp:chrome_version_header', |
| 658 ], | 662 ], |
| 659 'include_dirs': [ | 663 'include_dirs': [ |
| 660 # To allow including "version.h" | 664 # To allow including "version.h" |
| 661 '<(SHARED_INTERMEDIATE_DIR)', | 665 '<(SHARED_INTERMEDIATE_DIR)', |
| 662 ], | 666 ], |
| (...skipping 429 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1092 ], # 'conditions' | 1096 ], # 'conditions' |
| 1093 } | 1097 } |
| 1094 | 1098 |
| 1095 # vim: shiftwidth=2:et:ai:tabstop=2 | 1099 # vim: shiftwidth=2:et:ai:tabstop=2 |
| 1096 | 1100 |
| 1097 # Local Variables: | 1101 # Local Variables: |
| 1098 # tab-width:2 | 1102 # tab-width:2 |
| 1099 # indent-tabs-mode:nil | 1103 # indent-tabs-mode:nil |
| 1100 # End: | 1104 # End: |
| 1101 # vim: set expandtab tabstop=2 shiftwidth=2: | 1105 # vim: set expandtab tabstop=2 shiftwidth=2: |
| OLD | NEW |