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

Side by Side Diff: base/BUILD.gn

Issue 1180583002: GN updates to build base on iOS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address concerns raised in https://codereview.chromium.org/1180583002 Created 5 years, 6 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
« no previous file with comments | « no previous file | base/process/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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" ]
Nico 2015/06/11 21:45:04 This isn't in gyp. Did I understand correctly that
Chinmay 2015/06/11 22:32:16 Disabling `-Wno-deprecated-declarations` gives me
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",
24 ] 29 ]
25 } 30 }
26 } 31 }
27 32
28 source_set("base_paths") { 33 source_set("base_paths") {
29 sources = [ 34 sources = [
30 "base_paths.cc", 35 "base_paths.cc",
31 "base_paths.h", 36 "base_paths.h",
32 "base_paths_android.cc", 37 "base_paths_android.cc",
33 "base_paths_android.h", 38 "base_paths_android.h",
34 "base_paths_mac.h", 39 "base_paths_mac.h",
35 "base_paths_mac.mm", 40 "base_paths_mac.mm",
36 "base_paths_posix.cc", 41 "base_paths_posix.cc",
37 "base_paths_posix.h", 42 "base_paths_posix.h",
38 "base_paths_win.cc", 43 "base_paths_win.cc",
39 "base_paths_win.h", 44 "base_paths_win.h",
40 ] 45 ]
41 46
42 if (is_android || is_mac) { 47 if (is_android || is_mac || is_ios) {
43 sources -= [ "base_paths_posix.cc" ] 48 sources -= [ "base_paths_posix.cc" ]
44 } 49 }
45 50
46 if (is_nacl) { 51 if (is_nacl) {
47 sources -= [ 52 sources -= [
48 "base_paths.cc", 53 "base_paths.cc",
49 "base_paths_posix.cc", 54 "base_paths_posix.cc",
50 ] 55 ]
51 } 56 }
52 57
(...skipping 704 matching lines...) Expand 10 before | Expand all | Expand 10 after
757 "powrprof.lib", 762 "powrprof.lib",
758 "setupapi.lib", 763 "setupapi.lib",
759 ] 764 ]
760 all_dependent_configs = [ ":base_win_linker_flags" ] 765 all_dependent_configs = [ ":base_win_linker_flags" ]
761 } else if (!is_nacl) { 766 } else if (!is_nacl) {
762 # Non-Windows. 767 # Non-Windows.
763 deps += [ "//third_party/libevent" ] 768 deps += [ "//third_party/libevent" ]
764 } 769 }
765 770
766 # Mac. 771 # Mac.
767 if (is_mac) { 772 if (is_mac || is_ios) {
773 # Common Desktop / iOS excludes
768 sources -= [ 774 sources -= [
769 "native_library_posix.cc", 775 "native_library_posix.cc",
770 "strings/sys_string_conversions_posix.cc", 776 "strings/sys_string_conversions_posix.cc",
771 "threading/platform_thread_internal_posix.cc", 777 "threading/platform_thread_internal_posix.cc",
772 ] 778 ]
779
780 if (is_ios) {
781 sources -= [
782 "files/file_path_watcher_fsevents.cc",
783 "files/file_path_watcher_fsevents.h",
784 ]
785 }
773 } else { 786 } else {
774 # Non-Mac. 787 # Non-Mac.
775 sources -= [ 788 sources -= [
776 "files/file_path_watcher_fsevents.cc", 789 "files/file_path_watcher_fsevents.cc",
777 "files/file_path_watcher_fsevents.h", 790 "files/file_path_watcher_fsevents.h",
778 "files/file_path_watcher_kqueue.cc", 791 "files/file_path_watcher_kqueue.cc",
779 "files/file_path_watcher_kqueue.h", 792 "files/file_path_watcher_kqueue.h",
780 ] 793 ]
781 } 794 }
782 795
(...skipping 24 matching lines...) Expand all
807 ] 820 ]
808 821
809 if (!is_android) { 822 if (!is_android) {
810 sources -= [ 823 sources -= [
811 "linux_util.cc", 824 "linux_util.cc",
812 "linux_util.h", 825 "linux_util.h",
813 ] 826 ]
814 } 827 }
815 } 828 }
816 829
830 # iOS
831 if (is_ios) {
832 set_sources_assignment_filter([])
833
834 sources += [
Nico 2015/06/12 00:42:08 Do you want to add atomicops_internals_mac.h too?
835 "base_paths_mac.h",
836 "base_paths_mac.mm",
Nico 2015/06/11 21:45:04 I still don't see this included in the gyp files
837 "files/file_util_mac.mm",
838 "mac/bundle_locations.h",
839 "mac/bundle_locations.mm",
840 "mac/foundation_util.h",
841 "mac/foundation_util.mm",
842 "mac/mach_logging.cc",
843 "mac/mach_logging.h",
Nico 2015/06/12 00:42:08 The gyp file also adds objc_property_releaser.h/mm
844 "mac/scoped_mach_port.cc",
845 "mac/scoped_mach_port.h",
846 "mac/scoped_nsautorelease_pool.h",
847 "mac/scoped_nsautorelease_pool.mm",
848 "message_loop/message_pump_mac.h",
849 "message_loop/message_pump_mac.mm",
850 "strings/sys_string_conversions_mac.mm",
851 "threading/platform_thread_mac.mm",
852 "time/time_mac.cc",
853 ]
854
855 set_sources_assignment_filter(sources_assignment_filter)
856 }
857
817 if (!use_glib) { 858 if (!use_glib) {
818 sources -= [ 859 sources -= [
819 "message_loop/message_pump_glib.cc", 860 "message_loop/message_pump_glib.cc",
820 "message_loop/message_pump_glib.h", 861 "message_loop/message_pump_glib.h",
821 ] 862 ]
822 } 863 }
823 864
824 configs += [ "//build/config/compiler:wexit_time_destructors" ] 865 configs += [ "//build/config/compiler:wexit_time_destructors" ]
825 if (is_android && !is_debug) { 866 if (is_android && !is_debug) {
826 configs -= [ "//build/config/compiler:optimize" ] 867 configs -= [ "//build/config/compiler:optimize" ]
(...skipping 506 matching lines...) Expand 10 before | Expand all | Expand 10 after
1333 apk_deps = [ 1374 apk_deps = [
1334 ":base_java", 1375 ":base_java",
1335 ":base_java_unittest_support", 1376 ":base_java_unittest_support",
1336 ] 1377 ]
1337 isolate_file = "base_unittests.isolate" 1378 isolate_file = "base_unittests.isolate"
1338 } 1379 }
1339 1380
1340 if (is_ios) { 1381 if (is_ios) {
1341 sources -= [ 1382 sources -= [
1342 "process/memory_unittest.cc", 1383 "process/memory_unittest.cc",
1343 "process/memory_unittest_mac.h",
1344 "process/memory_unittest_mac.mm",
1345 "process/process_unittest.cc", 1384 "process/process_unittest.cc",
1346 "process/process_util_unittest.cc", 1385 "process/process_util_unittest.cc",
1347 ] 1386 ]
1348 1387
1349 # Pull in specific Mac files for iOS (which have been filtered out by file 1388 # Pull in specific Mac files for iOS (which have been filtered out by file
1350 # name rules). 1389 # name rules).
1351 set_sources_assignment_filter([]) 1390 set_sources_assignment_filter([])
1352 sources += [ 1391 sources += [
1353 "mac/bind_objc_block_unittest.mm", 1392 "mac/bind_objc_block_unittest.mm",
1354 "mac/foundation_util_unittest.mm", 1393 "mac/foundation_util_unittest.mm",
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
1511 1550
1512 # GYP: //base.gyp:base_java_unittest_support 1551 # GYP: //base.gyp:base_java_unittest_support
1513 android_library("base_java_unittest_support") { 1552 android_library("base_java_unittest_support") {
1514 deps = [ 1553 deps = [
1515 ":base_java", 1554 ":base_java",
1516 ] 1555 ]
1517 java_files = 1556 java_files =
1518 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ] 1557 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ]
1519 } 1558 }
1520 } 1559 }
OLDNEW
« no previous file with comments | « no previous file | base/process/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698