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 } |
| 11 | 11 |
| 12 config("base_implementation") { | 12 config("base_implementation") { |
| 13 defines = [ "BASE_IMPLEMENTATION" ] | 13 defines = [ "BASE_IMPLEMENTATION" ] |
| 14 | |
| 15 if (is_ios) { | |
| 16 # base uses routines deprecated in iOS 8 | |
| 17 cflags = [ "-Wno-deprecated-declarations" ] | |
| 18 } | |
| 14 } | 19 } |
| 15 | 20 |
| 16 if (is_win) { | 21 if (is_win) { |
| 17 # This is in a separate config so the flags can be applied to dependents. | 22 # This is in a separate config so the flags can be applied to dependents. |
| 18 # ldflags in GN aren't automatically inherited. | 23 # ldflags in GN aren't automatically inherited. |
| 19 config("base_win_linker_flags") { | 24 config("base_win_linker_flags") { |
| 20 ldflags = [ | 25 ldflags = [ |
| 21 "/DELAYLOAD:cfgmgr32.dll", | 26 "/DELAYLOAD:cfgmgr32.dll", |
| 22 "/DELAYLOAD:powrprof.dll", | 27 "/DELAYLOAD:powrprof.dll", |
| 23 "/DELAYLOAD:setupapi.dll", | 28 "/DELAYLOAD:setupapi.dll", |
| (...skipping 779 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 803 if (is_asan) { | 808 if (is_asan) { |
| 804 # TODO(GYP) hook up asan on Mac. GYP has this extra dylib: | 809 # TODO(GYP) hook up asan on Mac. GYP has this extra dylib: |
| 805 #data += [ "$root_out_dir/libclang_rt.asan_osx_dynamic.dylib" ] | 810 #data += [ "$root_out_dir/libclang_rt.asan_osx_dynamic.dylib" ] |
| 806 } | 811 } |
| 807 | 812 |
| 808 if (is_ios) { | 813 if (is_ios) { |
| 809 sources -= [ | 814 sources -= [ |
| 810 "files/file_path_watcher_fsevents.cc", | 815 "files/file_path_watcher_fsevents.cc", |
| 811 "files/file_path_watcher_fsevents.h", | 816 "files/file_path_watcher_fsevents.h", |
| 812 ] | 817 ] |
| 818 | |
| 819 set_sources_assignment_filter([]) | |
| 820 sources += [ "files/file_path_watcher_mac.cc" ] | |
|
brettw
2015/08/04 18:07:28
This also appears in https://codereview.chromium.o
Dirk Pranke
2015/08/04 18:27:15
Yeah, I need to merge things.
| |
| 821 set_sources_assignment_filter(sources_assignment_filter) | |
| 813 } | 822 } |
| 814 } else { | 823 } else { |
| 815 # Non-Mac. | 824 # Non-Mac. |
| 816 sources -= [ | 825 sources -= [ |
| 817 "files/file_path_watcher_fsevents.cc", | 826 "files/file_path_watcher_fsevents.cc", |
| 818 "files/file_path_watcher_fsevents.h", | 827 "files/file_path_watcher_fsevents.h", |
| 819 "files/file_path_watcher_kqueue.cc", | 828 "files/file_path_watcher_kqueue.cc", |
| 820 "files/file_path_watcher_kqueue.h", | 829 "files/file_path_watcher_kqueue.h", |
| 821 ] | 830 ] |
| 822 } | 831 } |
| (...skipping 489 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1312 "prefs/pref_value_map_unittest.cc", | 1321 "prefs/pref_value_map_unittest.cc", |
| 1313 "prefs/pref_value_store_unittest.cc", | 1322 "prefs/pref_value_store_unittest.cc", |
| 1314 "prefs/scoped_user_pref_update_unittest.cc", | 1323 "prefs/scoped_user_pref_update_unittest.cc", |
| 1315 "process/memory_unittest.cc", | 1324 "process/memory_unittest.cc", |
| 1316 "process/memory_unittest_mac.h", | 1325 "process/memory_unittest_mac.h", |
| 1317 "process/memory_unittest_mac.mm", | 1326 "process/memory_unittest_mac.mm", |
| 1318 "process/process_metrics_unittest.cc", | 1327 "process/process_metrics_unittest.cc", |
| 1319 "process/process_metrics_unittest_ios.cc", | 1328 "process/process_metrics_unittest_ios.cc", |
| 1320 "process/process_unittest.cc", | 1329 "process/process_unittest.cc", |
| 1321 "process/process_util_unittest.cc", | 1330 "process/process_util_unittest.cc", |
| 1322 "process/process_util_unittest_ios.cc", | |
| 1323 "profiler/stack_sampling_profiler_unittest.cc", | 1331 "profiler/stack_sampling_profiler_unittest.cc", |
| 1324 "profiler/tracked_time_unittest.cc", | 1332 "profiler/tracked_time_unittest.cc", |
| 1325 "rand_util_unittest.cc", | 1333 "rand_util_unittest.cc", |
| 1326 "scoped_clear_errno_unittest.cc", | 1334 "scoped_clear_errno_unittest.cc", |
| 1327 "scoped_generic_unittest.cc", | 1335 "scoped_generic_unittest.cc", |
| 1328 "scoped_native_library_unittest.cc", | 1336 "scoped_native_library_unittest.cc", |
| 1329 "security_unittest.cc", | 1337 "security_unittest.cc", |
| 1330 "sequence_checker_unittest.cc", | 1338 "sequence_checker_unittest.cc", |
| 1331 "sha1_unittest.cc", | 1339 "sha1_unittest.cc", |
| 1332 "stl_util_unittest.cc", | 1340 "stl_util_unittest.cc", |
| (...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1452 ] | 1460 ] |
| 1453 | 1461 |
| 1454 # Pull in specific Mac files for iOS (which have been filtered out by file | 1462 # Pull in specific Mac files for iOS (which have been filtered out by file |
| 1455 # name rules). | 1463 # name rules). |
| 1456 set_sources_assignment_filter([]) | 1464 set_sources_assignment_filter([]) |
| 1457 sources += [ | 1465 sources += [ |
| 1458 "mac/bind_objc_block_unittest.mm", | 1466 "mac/bind_objc_block_unittest.mm", |
| 1459 "mac/foundation_util_unittest.mm", | 1467 "mac/foundation_util_unittest.mm", |
| 1460 "mac/objc_property_releaser_unittest.mm", | 1468 "mac/objc_property_releaser_unittest.mm", |
| 1461 "mac/scoped_nsobject_unittest.mm", | 1469 "mac/scoped_nsobject_unittest.mm", |
| 1462 "sys_string_conversions_mac_unittest.mm", | 1470 "strings/sys_string_conversions_mac_unittest.mm", |
| 1463 ] | 1471 ] |
| 1464 set_sources_assignment_filter(sources_assignment_filter) | 1472 set_sources_assignment_filter(sources_assignment_filter) |
| 1465 | 1473 |
| 1466 # TODO(GYP): dep on copy_test_data_ios action. | 1474 # TODO(GYP): dep on copy_test_data_ios action. |
| 1467 } | 1475 } |
| 1468 | 1476 |
| 1469 if (is_linux) { | 1477 if (is_linux) { |
| 1470 sources -= [ "file_version_info_unittest.cc" ] | 1478 sources -= [ "file_version_info_unittest.cc" ] |
| 1471 sources += [ "nix/xdg_util_unittest.cc" ] | 1479 sources += [ "nix/xdg_util_unittest.cc" ] |
| 1472 deps += [ "//base/test:malloc_wrapper" ] | 1480 deps += [ "//base/test:malloc_wrapper" ] |
| (...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1625 | 1633 |
| 1626 # GYP: //base.gyp:base_java_unittest_support | 1634 # GYP: //base.gyp:base_java_unittest_support |
| 1627 android_library("base_java_unittest_support") { | 1635 android_library("base_java_unittest_support") { |
| 1628 deps = [ | 1636 deps = [ |
| 1629 ":base_java", | 1637 ":base_java", |
| 1630 ] | 1638 ] |
| 1631 java_files = | 1639 java_files = |
| 1632 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ] | 1640 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ] |
| 1633 } | 1641 } |
| 1634 } | 1642 } |
| OLD | NEW |