Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(119)

Side by Side Diff: base/BUILD.gn

Issue 1250913002: patch from chinmaygarde@ to make progress on mac, ios. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tweaks needed to get base_unittests to compile Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 776 matching lines...) Expand 10 before | Expand all | Expand 10 after
800 if (is_asan) { 805 if (is_asan) {
801 # TODO(GYP) hook up asan on Mac. GYP has this extra dylib: 806 # TODO(GYP) hook up asan on Mac. GYP has this extra dylib:
802 #data += [ "$root_out_dir/libclang_rt.asan_osx_dynamic.dylib" ] 807 #data += [ "$root_out_dir/libclang_rt.asan_osx_dynamic.dylib" ]
803 } 808 }
804 809
805 if (is_ios) { 810 if (is_ios) {
806 sources -= [ 811 sources -= [
807 "files/file_path_watcher_fsevents.cc", 812 "files/file_path_watcher_fsevents.cc",
808 "files/file_path_watcher_fsevents.h", 813 "files/file_path_watcher_fsevents.h",
809 ] 814 ]
815
816 set_sources_assignment_filter([])
817 sources += [ "files/file_path_watcher_mac.cc" ]
818 set_sources_assignment_filter(sources_assignment_filter)
810 } 819 }
811 } else { 820 } else {
812 # Non-Mac. 821 # Non-Mac.
813 sources -= [ 822 sources -= [
814 "files/file_path_watcher_fsevents.cc", 823 "files/file_path_watcher_fsevents.cc",
815 "files/file_path_watcher_fsevents.h", 824 "files/file_path_watcher_fsevents.h",
816 "files/file_path_watcher_kqueue.cc", 825 "files/file_path_watcher_kqueue.cc",
817 "files/file_path_watcher_kqueue.h", 826 "files/file_path_watcher_kqueue.h",
818 ] 827 ]
819 } 828 }
(...skipping 489 matching lines...) Expand 10 before | Expand all | Expand 10 after
1309 "prefs/pref_value_map_unittest.cc", 1318 "prefs/pref_value_map_unittest.cc",
1310 "prefs/pref_value_store_unittest.cc", 1319 "prefs/pref_value_store_unittest.cc",
1311 "prefs/scoped_user_pref_update_unittest.cc", 1320 "prefs/scoped_user_pref_update_unittest.cc",
1312 "process/memory_unittest.cc", 1321 "process/memory_unittest.cc",
1313 "process/memory_unittest_mac.h", 1322 "process/memory_unittest_mac.h",
1314 "process/memory_unittest_mac.mm", 1323 "process/memory_unittest_mac.mm",
1315 "process/process_metrics_unittest.cc", 1324 "process/process_metrics_unittest.cc",
1316 "process/process_metrics_unittest_ios.cc", 1325 "process/process_metrics_unittest_ios.cc",
1317 "process/process_unittest.cc", 1326 "process/process_unittest.cc",
1318 "process/process_util_unittest.cc", 1327 "process/process_util_unittest.cc",
1319 "process/process_util_unittest_ios.cc",
1320 "profiler/stack_sampling_profiler_unittest.cc", 1328 "profiler/stack_sampling_profiler_unittest.cc",
1321 "profiler/tracked_time_unittest.cc", 1329 "profiler/tracked_time_unittest.cc",
1322 "rand_util_unittest.cc", 1330 "rand_util_unittest.cc",
1323 "scoped_clear_errno_unittest.cc", 1331 "scoped_clear_errno_unittest.cc",
1324 "scoped_generic_unittest.cc", 1332 "scoped_generic_unittest.cc",
1325 "scoped_native_library_unittest.cc", 1333 "scoped_native_library_unittest.cc",
1326 "security_unittest.cc", 1334 "security_unittest.cc",
1327 "sequence_checker_unittest.cc", 1335 "sequence_checker_unittest.cc",
1328 "sha1_unittest.cc", 1336 "sha1_unittest.cc",
1329 "stl_util_unittest.cc", 1337 "stl_util_unittest.cc",
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
1449 ] 1457 ]
1450 1458
1451 # Pull in specific Mac files for iOS (which have been filtered out by file 1459 # Pull in specific Mac files for iOS (which have been filtered out by file
1452 # name rules). 1460 # name rules).
1453 set_sources_assignment_filter([]) 1461 set_sources_assignment_filter([])
1454 sources += [ 1462 sources += [
1455 "mac/bind_objc_block_unittest.mm", 1463 "mac/bind_objc_block_unittest.mm",
1456 "mac/foundation_util_unittest.mm", 1464 "mac/foundation_util_unittest.mm",
1457 "mac/objc_property_releaser_unittest.mm", 1465 "mac/objc_property_releaser_unittest.mm",
1458 "mac/scoped_nsobject_unittest.mm", 1466 "mac/scoped_nsobject_unittest.mm",
1459 "sys_string_conversions_mac_unittest.mm", 1467 "strings/sys_string_conversions_mac_unittest.mm",
sdefresne 2015/07/25 19:15:29 It looks like this file is not build on iOS when u
Dirk Pranke 2015/07/31 21:27:40 this looks like it is pulled in to me: https://co
sdefresne 2015/08/04 07:42:01 It isn't, because the regexp does not match the fi
1460 ] 1468 ]
1461 set_sources_assignment_filter(sources_assignment_filter) 1469 set_sources_assignment_filter(sources_assignment_filter)
1462 1470
1463 # TODO(GYP): dep on copy_test_data_ios action. 1471 # TODO(GYP): dep on copy_test_data_ios action.
1464 } 1472 }
1465 1473
1466 if (is_linux) { 1474 if (is_linux) {
1467 sources -= [ "file_version_info_unittest.cc" ] 1475 sources -= [ "file_version_info_unittest.cc" ]
1468 sources += [ "nix/xdg_util_unittest.cc" ] 1476 sources += [ "nix/xdg_util_unittest.cc" ]
1469 deps += [ "//base/test:malloc_wrapper" ] 1477 deps += [ "//base/test:malloc_wrapper" ]
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
1622 1630
1623 # GYP: //base.gyp:base_java_unittest_support 1631 # GYP: //base.gyp:base_java_unittest_support
1624 android_library("base_java_unittest_support") { 1632 android_library("base_java_unittest_support") {
1625 deps = [ 1633 deps = [
1626 ":base_java", 1634 ":base_java",
1627 ] 1635 ]
1628 java_files = 1636 java_files =
1629 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ] 1637 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ]
1630 } 1638 }
1631 } 1639 }
OLDNEW
« no previous file with comments | « BUILD.gn ('k') | base/process/BUILD.gn » ('j') | base/test/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698