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

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: more cleanup Created 5 years, 4 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 612 matching lines...) Expand 10 before | Expand all | Expand 10 after
636 "win/startup_information.h", 641 "win/startup_information.h",
637 "win/win_util.cc", 642 "win/win_util.cc",
638 "win/win_util.h", 643 "win/win_util.h",
639 "win/windows_version.cc", 644 "win/windows_version.cc",
640 "win/windows_version.h", 645 "win/windows_version.h",
641 "win/wrapped_window_proc.cc", 646 "win/wrapped_window_proc.cc",
642 "win/wrapped_window_proc.h", 647 "win/wrapped_window_proc.h",
643 ] 648 ]
644 649
645 if (is_ios) { 650 if (is_ios) {
646 sources += [ "process/memory_stubs.cc" ]
647 sources -= [ 651 sources -= [
648 "message_loop/message_pump_libevent.cc", 652 "message_loop/message_pump_libevent.cc",
649 "message_loop/message_pump_libevent.h", 653 "message_loop/message_pump_libevent.h",
650 ] 654 ]
651 655
652 set_sources_assignment_filter([]) 656 set_sources_assignment_filter([])
653 sources += [ "files/file_path_watcher_mac.cc" ] 657 sources += [ "files/file_path_watcher_mac.cc" ]
654 set_sources_assignment_filter(sources_assignment_filter) 658 set_sources_assignment_filter(sources_assignment_filter)
655 } 659 }
656 660
(...skipping 802 matching lines...) Expand 10 before | Expand all | Expand 10 after
1459 ":base_java_unittest_support", 1463 ":base_java_unittest_support",
1460 ] 1464 ]
1461 1465
1462 # TODO(brettw) I think this should not be here, we should not be using 1466 # TODO(brettw) I think this should not be here, we should not be using
1463 # isolate files. 1467 # isolate files.
1464 isolate_file = "base_unittests.isolate" 1468 isolate_file = "base_unittests.isolate"
1465 } 1469 }
1466 1470
1467 if (is_ios) { 1471 if (is_ios) {
1468 sources -= [ 1472 sources -= [
1473 "memory/discardable_shared_memory_unittest.cc",
1474 "memory/shared_memory_unittest.cc",
1469 "process/memory_unittest.cc", 1475 "process/memory_unittest.cc",
1470 "process/process_unittest.cc", 1476 "process/process_unittest.cc",
1471 "process/process_util_unittest.cc", 1477 "process/process_util_unittest.cc",
1472 ] 1478 ]
1473 1479
1474 # Pull in specific Mac files for iOS (which have been filtered out by file 1480 # Pull in specific Mac files for iOS (which have been filtered out by file
1475 # name rules). 1481 # name rules).
1476 set_sources_assignment_filter([]) 1482 set_sources_assignment_filter([])
1477 sources += [ 1483 sources += [
1478 "mac/bind_objc_block_unittest.mm", 1484 "mac/bind_objc_block_unittest.mm",
1479 "mac/foundation_util_unittest.mm", 1485 "mac/foundation_util_unittest.mm",
1480 "mac/objc_property_releaser_unittest.mm", 1486 "mac/objc_property_releaser_unittest.mm",
1481 "mac/scoped_nsobject_unittest.mm", 1487 "mac/scoped_nsobject_unittest.mm",
1482 "sys_string_conversions_mac_unittest.mm", 1488 "strings/sys_string_conversions_mac_unittest.mm",
1483 ] 1489 ]
1484 set_sources_assignment_filter(sources_assignment_filter) 1490 set_sources_assignment_filter(sources_assignment_filter)
1485 1491
1486 # TODO(GYP): dep on copy_test_data_ios action. 1492 # TODO(GYP): dep on copy_test_data_ios action.
1487 } 1493 }
1488 1494
1489 if (is_linux) { 1495 if (is_linux) {
1490 sources -= [ "file_version_info_unittest.cc" ] 1496 sources -= [ "file_version_info_unittest.cc" ]
1491 sources += [ "nix/xdg_util_unittest.cc" ] 1497 sources += [ "nix/xdg_util_unittest.cc" ]
1492 deps += [ "//base/test:malloc_wrapper" ] 1498 deps += [ "//base/test:malloc_wrapper" ]
1493 1499
1494 if (use_glib) { 1500 if (use_glib) {
1495 configs += [ "//build/config/linux:glib" ] 1501 configs += [ "//build/config/linux:glib" ]
1496 } 1502 }
1497 } 1503 }
1498 1504
1499 if (!is_linux || use_ozone) { 1505 if (!is_linux || use_ozone) {
1500 sources -= [ "message_loop/message_pump_glib_unittest.cc" ] 1506 sources -= [ "message_loop/message_pump_glib_unittest.cc" ]
1501 } 1507 }
1502 1508
1503 if (is_posix || is_ios) { 1509 if (is_posix && !is_ios) {
1504 sources += [ "message_loop/message_pump_libevent_unittest.cc" ] 1510 sources += [ "message_loop/message_pump_libevent_unittest.cc" ]
1505 deps += [ "//third_party/libevent" ] 1511 deps += [ "//third_party/libevent" ]
1506 } 1512 }
1507 1513
1508 if (is_android) { 1514 if (is_android) {
1509 deps += [ "//testing/android/native_test:native_test_native_code" ] 1515 deps += [ "//testing/android/native_test:native_test_native_code" ]
1510 set_sources_assignment_filter([]) 1516 set_sources_assignment_filter([])
1511 sources += [ "debug/proc_maps_linux_unittest.cc" ] 1517 sources += [ "debug/proc_maps_linux_unittest.cc" ]
1512 set_sources_assignment_filter(sources_assignment_filter) 1518 set_sources_assignment_filter(sources_assignment_filter)
1513 } 1519 }
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
1645 1651
1646 # GYP: //base.gyp:base_java_unittest_support 1652 # GYP: //base.gyp:base_java_unittest_support
1647 android_library("base_java_unittest_support") { 1653 android_library("base_java_unittest_support") {
1648 deps = [ 1654 deps = [
1649 ":base_java", 1655 ":base_java",
1650 ] 1656 ]
1651 java_files = 1657 java_files =
1652 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ] 1658 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ]
1653 } 1659 }
1654 } 1660 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698