Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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 'includes': [ | 9 'includes': [ |
| 10 '../build/win_precompile.gypi', | 10 '../build/win_precompile.gypi', |
| (...skipping 683 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 694 'base_i18n', | 694 'base_i18n', |
| 695 'base_message_loop_tests', | 695 'base_message_loop_tests', |
| 696 'base_prefs', | 696 'base_prefs', |
| 697 'base_prefs_test_support', | 697 'base_prefs_test_support', |
| 698 'base_static', | 698 'base_static', |
| 699 'run_all_unittests', | 699 'run_all_unittests', |
| 700 'test_support_base', | 700 'test_support_base', |
| 701 'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotat ions', | 701 'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotat ions', |
| 702 '../testing/gmock.gyp:gmock', | 702 '../testing/gmock.gyp:gmock', |
| 703 '../testing/gtest.gyp:gtest', | 703 '../testing/gtest.gyp:gtest', |
| 704 '../third_party/icu/icu.gyp:icuuc', | |
|
Mark Mentovai
2013/12/17 22:12:02
Why are you moving this? Seems like a no-op change
jungshik at Google
2013/12/18 20:59:11
Sorry to get you 'alarmed'. That's just an acciden
| |
| 704 '../third_party/icu/icu.gyp:icui18n', | 705 '../third_party/icu/icu.gyp:icui18n', |
| 705 '../third_party/icu/icu.gyp:icuuc', | |
| 706 ], | 706 ], |
| 707 'includes': ['../build/nocompile.gypi'], | 707 'includes': ['../build/nocompile.gypi'], |
| 708 'variables': { | 708 'variables': { |
| 709 # TODO(ajwong): Is there a way to autodetect this? | 709 # TODO(ajwong): Is there a way to autodetect this? |
| 710 'module_dir': 'base' | 710 'module_dir': 'base' |
| 711 }, | 711 }, |
| 712 'conditions': [ | 712 'conditions': [ |
| 713 ['desktop_linux == 1 or chromeos == 1', { | 713 ['desktop_linux == 1 or chromeos == 1', { |
| 714 'defines': [ | 714 'defines': [ |
| 715 'USE_SYMBOLIZE', | 715 'USE_SYMBOLIZE', |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 788 'message_loop/message_pump_glib_unittest.cc', | 788 'message_loop/message_pump_glib_unittest.cc', |
| 789 ] | 789 ] |
| 790 }], | 790 }], |
| 791 ['OS == "linux" and linux_use_tcmalloc==1', { | 791 ['OS == "linux" and linux_use_tcmalloc==1', { |
| 792 'dependencies': [ | 792 'dependencies': [ |
| 793 'allocator/allocator.gyp:allocator', | 793 'allocator/allocator.gyp:allocator', |
| 794 ], | 794 ], |
| 795 }, | 795 }, |
| 796 ], | 796 ], |
| 797 ['OS == "win"', { | 797 ['OS == "win"', { |
| 798 # This is needed to trigger the dll copy step on windows. | 798 # This is needed to trigger the dll copy step on windows. |
|
Mark Mentovai
2013/12/17 22:12:02
Move the comment into the condition it applies to.
jungshik at Google
2013/12/18 20:59:11
Done.
| |
| 799 # TODO(mark): This should not be necessary. | 799 # TODO(mark): This should not be necessary. |
| 800 'dependencies': [ | 800 'conditions': [ |
| 801 '../third_party/icu/icu.gyp:icudata', | 801 ['icu_use_data_file_flag==0', { |
| 802 'dependencies': [ | |
| 803 '../third_party/icu/icu.gyp:icudata', | |
| 804 ], | |
| 805 }], | |
| 802 ], | 806 ], |
| 803 'sources!': [ | 807 'sources!': [ |
| 804 'file_descriptor_shuffle_unittest.cc', | 808 'file_descriptor_shuffle_unittest.cc', |
| 805 'files/dir_reader_posix_unittest.cc', | 809 'files/dir_reader_posix_unittest.cc', |
| 806 'threading/worker_pool_posix_unittest.cc', | 810 'threading/worker_pool_posix_unittest.cc', |
| 807 'message_loop/message_pump_libevent_unittest.cc', | 811 'message_loop/message_pump_libevent_unittest.cc', |
| 808 ], | 812 ], |
| 809 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. | 813 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
| 810 'msvs_disabled_warnings': [ | 814 'msvs_disabled_warnings': [ |
| 811 4267, | 815 4267, |
| (...skipping 588 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1400 'base_unittests.isolate', | 1404 'base_unittests.isolate', |
| 1401 ], | 1405 ], |
| 1402 'sources': [ | 1406 'sources': [ |
| 1403 'base_unittests.isolate', | 1407 'base_unittests.isolate', |
| 1404 ], | 1408 ], |
| 1405 }, | 1409 }, |
| 1406 ], | 1410 ], |
| 1407 }], | 1411 }], |
| 1408 ], | 1412 ], |
| 1409 } | 1413 } |
| OLD | NEW |