diff options
author | sherouk <sherouk@google.com> | 2015-08-05 03:19:10 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-08-05 10:22:48 +0000 |
commit | e1859f9e90fc21052aacdb08698ed72a332773fc (patch) | |
tree | 7cac3032b525ec402baa31fbd6e9a1efa8ac5d24 /base | |
parent | a6aefecce774b2ca71bb764c70ad6f87dfd446bf (diff) | |
download | chromium_src-e1859f9e90fc21052aacdb08698ed72a332773fc.zip chromium_src-e1859f9e90fc21052aacdb08698ed72a332773fc.tar.gz chromium_src-e1859f9e90fc21052aacdb08698ed72a332773fc.tar.bz2 |
Editing iOS sources and dependencies for //base.
Build "base_i18n_perftests" and "base_perftests" on iOS.
Check that the list of files build with gn and gyp are the same.
BUG=459705
Review URL: https://codereview.chromium.org/1257303005
Cr-Commit-Position: refs/heads/master@{#341877}
Diffstat (limited to 'base')
-rw-r--r-- | base/BUILD.gn | 34 | ||||
-rw-r--r-- | base/memory/BUILD.gn | 3 | ||||
-rw-r--r-- | base/test/BUILD.gn | 2 |
3 files changed, 32 insertions, 7 deletions
diff --git a/base/BUILD.gn b/base/BUILD.gn index 1e96723..da16ec3 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn @@ -246,10 +246,14 @@ component("base") { "hash.cc", "hash.h", "id_map.h", + "ios/crb_protocol_observers.h", + "ios/crb_protocol_observers.mm", "ios/device_util.h", "ios/device_util.mm", "ios/ios_util.h", "ios/ios_util.mm", + "ios/ns_error_util.h", + "ios/ns_error_util.mm", "ios/scoped_critical_action.h", "ios/scoped_critical_action.mm", "ios/weak_nsobject.h", @@ -638,6 +642,18 @@ component("base") { "win/wrapped_window_proc.h", ] + if (is_ios) { + sources += [ "process/memory_stubs.cc" ] + sources -= [ + "message_loop/message_pump_libevent.cc", + "message_loop/message_pump_libevent.h", + ] + + set_sources_assignment_filter([]) + sources += [ "files/file_path_watcher_mac.cc" ] + set_sources_assignment_filter(sources_assignment_filter) + } + sources -= [ "sys_info_freebsd.cc", "sys_info_openbsd.cc", @@ -1001,7 +1017,7 @@ component("i18n") { configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] } -if (is_win || (is_linux && !is_chromeos)) { +if (is_ios || is_win || (is_linux && !is_chromeos)) { # TODO(GYP): Figure out which of these work and are needed on other platforms. test("base_perftests") { sources = [ @@ -1060,23 +1076,18 @@ if (is_win || (is_linux && !is_chromeos)) { component("prefs") { sources = [ - "prefs/base_prefs_export.h", "prefs/default_pref_store.cc", "prefs/default_pref_store.h", "prefs/json_pref_store.cc", "prefs/json_pref_store.h", "prefs/overlay_user_pref_store.cc", "prefs/overlay_user_pref_store.h", - "prefs/persistent_pref_store.h", "prefs/pref_change_registrar.cc", "prefs/pref_change_registrar.h", - "prefs/pref_filter.h", "prefs/pref_member.cc", "prefs/pref_member.h", - "prefs/pref_notifier.h", "prefs/pref_notifier_impl.cc", "prefs/pref_notifier_impl.h", - "prefs/pref_observer.h", "prefs/pref_registry.cc", "prefs/pref_registry.h", "prefs/pref_registry_simple.cc", @@ -1095,8 +1106,17 @@ component("prefs") { "prefs/scoped_user_pref_update.h", "prefs/value_map_pref_store.cc", "prefs/value_map_pref_store.h", - "prefs/writeable_pref_store.h", ] + if (!is_ios) { + sources += [ + "prefs/base_prefs_export.h", + "prefs/persistent_pref_store.h", + "prefs/pref_filter.h", + "prefs/pref_notifier.h", + "prefs/pref_observer.h", + "prefs/writeable_pref_store.h", + ] + } defines = [ "BASE_PREFS_IMPLEMENTATION" ] diff --git a/base/memory/BUILD.gn b/base/memory/BUILD.gn index 79d99eb..abbfa64 100644 --- a/base/memory/BUILD.gn +++ b/base/memory/BUILD.gn @@ -46,6 +46,9 @@ source_set("memory") { "weak_ptr.cc", "weak_ptr.h", ] + if (is_ios) { + sources -= [ "shared_memory_posix.cc" ] + } if (is_nacl) { sources -= [ diff --git a/base/test/BUILD.gn b/base/test/BUILD.gn index 39eea78..c36d266 100644 --- a/base/test/BUILD.gn +++ b/base/test/BUILD.gn @@ -35,6 +35,8 @@ source_set("test_support") { "gtest_xml_util.h", "histogram_tester.cc", "histogram_tester.h", + "ios/wait_util.h", + "ios/wait_util.mm", "launcher/test_launcher.cc", "launcher/test_launcher.h", "launcher/test_result.cc", |