Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 import("//build/config/ui.gni") | 5 import("//build/config/ui.gni") |
| 6 import("//testing/test.gni") | 6 import("//testing/test.gni") |
| 7 | 7 |
| 8 if (is_android) { | 8 if (is_android) { |
| 9 import("//build/config/android/rules.gni") | 9 import("//build/config/android/rules.gni") |
| 10 } | 10 } |
| (...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 323 "message_loop/message_loop_proxy.cc", | 323 "message_loop/message_loop_proxy.cc", |
| 324 "message_loop/message_loop_proxy.h", | 324 "message_loop/message_loop_proxy.h", |
| 325 "message_loop/message_loop_proxy_impl.cc", | 325 "message_loop/message_loop_proxy_impl.cc", |
| 326 "message_loop/message_loop_proxy_impl.h", | 326 "message_loop/message_loop_proxy_impl.h", |
| 327 "message_loop/message_pump.cc", | 327 "message_loop/message_pump.cc", |
| 328 "message_loop/message_pump.h", | 328 "message_loop/message_pump.h", |
| 329 "message_loop/message_pump_android.cc", | 329 "message_loop/message_pump_android.cc", |
| 330 "message_loop/message_pump_android.h", | 330 "message_loop/message_pump_android.h", |
| 331 "message_loop/message_pump_default.cc", | 331 "message_loop/message_pump_default.cc", |
| 332 "message_loop/message_pump_default.h", | 332 "message_loop/message_pump_default.h", |
| 333 "message_loop/message_pump_glib.cc", | |
| 334 "message_loop/message_pump_glib.h", | |
| 335 "message_loop/message_pump_io_ios.cc", | 333 "message_loop/message_pump_io_ios.cc", |
| 336 "message_loop/message_pump_io_ios.h", | 334 "message_loop/message_pump_io_ios.h", |
| 337 "message_loop/message_pump_libevent.cc", | 335 "message_loop/message_pump_libevent.cc", |
| 338 "message_loop/message_pump_libevent.h", | 336 "message_loop/message_pump_libevent.h", |
| 339 "message_loop/message_pump_mac.h", | 337 "message_loop/message_pump_mac.h", |
| 340 "message_loop/message_pump_mac.mm", | 338 "message_loop/message_pump_mac.mm", |
| 341 "message_loop/message_pump_win.cc", | 339 "message_loop/message_pump_win.cc", |
| 342 "message_loop/message_pump_win.h", | 340 "message_loop/message_pump_win.h", |
| 343 "move.h", | 341 "move.h", |
| 344 "native_library.h", | 342 "native_library.h", |
| (...skipping 437 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 782 "files/file_path_watcher_fsevents.h", | 780 "files/file_path_watcher_fsevents.h", |
| 783 "files/file_path_watcher_kqueue.cc", | 781 "files/file_path_watcher_kqueue.cc", |
| 784 "files/file_path_watcher_kqueue.h", | 782 "files/file_path_watcher_kqueue.h", |
| 785 ] | 783 ] |
| 786 } | 784 } |
| 787 | 785 |
| 788 # Linux. | 786 # Linux. |
| 789 if (is_linux) { | 787 if (is_linux) { |
| 790 # TODO(brettw) this will need to be parameterized at some point. | 788 # TODO(brettw) this will need to be parameterized at some point. |
| 791 linux_configs = [] | 789 linux_configs = [] |
| 792 if (use_glib) { | |
| 793 linux_configs += [ "//build/config/linux:glib" ] | |
| 794 } | |
| 795 | 790 |
| 796 configs += linux_configs | 791 configs += linux_configs |
| 797 all_dependent_configs = linux_configs | 792 all_dependent_configs = linux_configs |
| 798 | 793 |
| 799 # These dependencies are not required on Android, and in the case | 794 # These dependencies are not required on Android, and in the case |
| 800 # of xdg_mime must be excluded due to licensing restrictions. | 795 # of xdg_mime must be excluded due to licensing restrictions. |
| 801 deps += [ | 796 deps += [ |
| 802 "//base/third_party/xdg_mime", | 797 "//base/third_party/xdg_mime", |
| 803 "//base/third_party/xdg_user_dirs", | 798 "//base/third_party/xdg_user_dirs", |
| 804 ] | 799 ] |
| 805 } else { | 800 } else { |
| 806 # Non-Linux. | 801 # Non-Linux. |
| 807 sources -= [ | 802 sources -= [ |
| 808 "nix/mime_util_xdg.cc", | 803 "nix/mime_util_xdg.cc", |
| 809 "nix/mime_util_xdg.h", | 804 "nix/mime_util_xdg.h", |
| 810 "nix/xdg_util.cc", | 805 "nix/xdg_util.cc", |
| 811 "nix/xdg_util.h", | 806 "nix/xdg_util.h", |
| 812 ] | 807 ] |
| 813 | 808 |
| 814 if (!is_android) { | 809 if (!is_android) { |
| 815 sources -= [ | 810 sources -= [ |
| 816 "linux_util.cc", | 811 "linux_util.cc", |
| 817 "linux_util.h", | 812 "linux_util.h", |
| 818 ] | 813 ] |
| 819 } | 814 } |
| 820 } | 815 } |
| 821 | 816 |
| 822 if (!use_glib) { | |
| 823 sources -= [ | |
| 824 "message_loop/message_pump_glib.cc", | |
| 825 "message_loop/message_pump_glib.h", | |
| 826 ] | |
| 827 } | |
| 828 | |
| 829 configs += [ "//build/config/compiler:wexit_time_destructors" ] | 817 configs += [ "//build/config/compiler:wexit_time_destructors" ] |
| 830 if (is_android && !is_debug) { | 818 if (is_android && !is_debug) { |
| 831 configs -= [ "//build/config/compiler:optimize" ] | 819 configs -= [ "//build/config/compiler:optimize" ] |
| 832 configs += [ "//build/config/compiler:optimize_max" ] | 820 configs += [ "//build/config/compiler:optimize_max" ] |
| 833 } | 821 } |
| 834 | 822 |
| 835 allow_circular_includes_from = public_deps | 823 allow_circular_includes_from = public_deps |
| 836 } | 824 } |
| 837 | 825 |
| 838 # This is the subset of files from base that should not be used with a dynamic | 826 # This is the subset of files from base that should not be used with a dynamic |
| (...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1171 "memory/scoped_ptr_unittest.cc", | 1159 "memory/scoped_ptr_unittest.cc", |
| 1172 "memory/scoped_ptr_unittest.nc", | 1160 "memory/scoped_ptr_unittest.nc", |
| 1173 "memory/scoped_vector_unittest.cc", | 1161 "memory/scoped_vector_unittest.cc", |
| 1174 "memory/shared_memory_unittest.cc", | 1162 "memory/shared_memory_unittest.cc", |
| 1175 "memory/singleton_unittest.cc", | 1163 "memory/singleton_unittest.cc", |
| 1176 "memory/weak_ptr_unittest.cc", | 1164 "memory/weak_ptr_unittest.cc", |
| 1177 "memory/weak_ptr_unittest.nc", | 1165 "memory/weak_ptr_unittest.nc", |
| 1178 "message_loop/message_loop_proxy_impl_unittest.cc", | 1166 "message_loop/message_loop_proxy_impl_unittest.cc", |
| 1179 "message_loop/message_loop_proxy_unittest.cc", | 1167 "message_loop/message_loop_proxy_unittest.cc", |
| 1180 "message_loop/message_loop_unittest.cc", | 1168 "message_loop/message_loop_unittest.cc", |
| 1181 "message_loop/message_pump_glib_unittest.cc", | |
| 1182 "message_loop/message_pump_io_ios_unittest.cc", | 1169 "message_loop/message_pump_io_ios_unittest.cc", |
| 1183 "metrics/bucket_ranges_unittest.cc", | 1170 "metrics/bucket_ranges_unittest.cc", |
| 1184 "metrics/field_trial_unittest.cc", | 1171 "metrics/field_trial_unittest.cc", |
| 1185 "metrics/histogram_base_unittest.cc", | 1172 "metrics/histogram_base_unittest.cc", |
| 1186 "metrics/histogram_delta_serialization_unittest.cc", | 1173 "metrics/histogram_delta_serialization_unittest.cc", |
| 1187 "metrics/histogram_snapshot_manager_unittest.cc", | 1174 "metrics/histogram_snapshot_manager_unittest.cc", |
| 1188 "metrics/histogram_unittest.cc", | 1175 "metrics/histogram_unittest.cc", |
| 1189 "metrics/sample_map_unittest.cc", | 1176 "metrics/sample_map_unittest.cc", |
| 1190 "metrics/sample_vector_unittest.cc", | 1177 "metrics/sample_vector_unittest.cc", |
| 1191 "metrics/sparse_histogram_unittest.cc", | 1178 "metrics/sparse_histogram_unittest.cc", |
| (...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1363 ] | 1350 ] |
| 1364 set_sources_assignment_filter(sources_assignment_filter) | 1351 set_sources_assignment_filter(sources_assignment_filter) |
| 1365 | 1352 |
| 1366 # TODO(GYP): dep on copy_test_data_ios action. | 1353 # TODO(GYP): dep on copy_test_data_ios action. |
| 1367 } | 1354 } |
| 1368 | 1355 |
| 1369 if (is_linux) { | 1356 if (is_linux) { |
| 1370 sources -= [ "file_version_info_unittest.cc" ] | 1357 sources -= [ "file_version_info_unittest.cc" ] |
| 1371 sources += [ "nix/xdg_util_unittest.cc" ] | 1358 sources += [ "nix/xdg_util_unittest.cc" ] |
| 1372 deps += [ "//base/test:malloc_wrapper" ] | 1359 deps += [ "//base/test:malloc_wrapper" ] |
| 1373 | |
| 1374 if (use_glib) { | |
| 1375 configs += [ "//build/config/linux:glib" ] | |
| 1376 } | |
| 1377 } | |
| 1378 | |
| 1379 if (!is_linux || use_ozone) { | |
|
viettrungluu
2015/11/12 02:35:41
This condition was obviously wrong.
jamesr
2015/11/12 02:38:41
This is the same as !use_glib, i think, so it's tr
| |
| 1380 sources -= [ "message_loop/message_pump_glib_unittest.cc" ] | |
| 1381 } | 1360 } |
| 1382 | 1361 |
| 1383 if (is_posix || is_ios) { | 1362 if (is_posix || is_ios) { |
| 1384 sources += [ "message_loop/message_pump_libevent_unittest.cc" ] | 1363 sources += [ "message_loop/message_pump_libevent_unittest.cc" ] |
| 1385 deps += [ "//third_party/libevent" ] | 1364 deps += [ "//third_party/libevent" ] |
| 1386 } | 1365 } |
| 1387 | 1366 |
| 1388 if (is_android) { | 1367 if (is_android) { |
| 1389 deps += [ "//testing/android/native_test:native_test_native_code" ] | 1368 deps += [ "//testing/android/native_test:native_test_native_code" ] |
| 1390 set_sources_assignment_filter([]) | 1369 set_sources_assignment_filter([]) |
| (...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1516 | 1495 |
| 1517 # GYP: //base.gyp:base_java_unittest_support | 1496 # GYP: //base.gyp:base_java_unittest_support |
| 1518 android_library("base_java_unittest_support") { | 1497 android_library("base_java_unittest_support") { |
| 1519 deps = [ | 1498 deps = [ |
| 1520 ":base_java", | 1499 ":base_java", |
| 1521 ] | 1500 ] |
| 1522 java_files = | 1501 java_files = |
| 1523 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ] | 1502 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ] |
| 1524 } | 1503 } |
| 1525 } | 1504 } |
| OLD | NEW |