Skip to content

Commit

Permalink
Add support for building "ios_chrome_unittests" with gn.
Browse files Browse the repository at this point in the history 
Port all targets required to build "ios_chrome_unittests" from gyp to gn,
adding reference to the GN target in the gyp files. The targets links but
does not runs as resources bundles are still unsupported with gn.

The resources are also not packed, but this will be done in a follow up
CL in order to reduce the size of this already large CL.

BUG=459705

Review URL: https://codereview.chromium.org/1452593002

Cr-Commit-Position: refs/heads/master@{#360552}
  • Loading branch information
@sdefresne
sdefresne authored and Commit bot committed Nov 19, 2015
1 parent b541206 commit 0ddaed5
Show file tree
Hide file tree
Showing 16 changed files with 1,267 additions and 5 deletions.
4 changes: 4 additions & 0 deletions BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,10 @@ group("both_gn_and_gyp") {
]
} else {
deps += [
"//ios/chrome/app",
"//ios/chrome/browser",
"//ios/chrome/common",
"//ios/chrome:ios_chrome_unittests",
"//ios/net:ios_net_unittests",
"//ios/public/provider/chrome/browser",
"//ios/public/provider/web",
Expand Down
91 changes: 91 additions & 0 deletions ios/chrome/BUILD.gn
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
# Copyright 2015 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

import("//testing/test.gni")

test("ios_chrome_unittests") {
sources = [
"app/safe_mode_util_unittest.cc",
"browser/chrome_url_util_unittest.mm",
"browser/crash_loop_detection_util_unittest.mm",
"browser/favicon/large_icon_cache_unittest.cc",
"browser/geolocation/CLLocation+XGeoHeaderTest.mm",
"browser/geolocation/location_manager_unittest.mm",
"browser/geolocation/omnibox_geolocation_local_state_unittest.mm",
"browser/install_time_util_unittest.mm",
"browser/installation_notifier_unittest.mm",
"browser/metrics/ios_chrome_metrics_service_accessor_unittest.cc",
"browser/metrics/ios_chrome_stability_metrics_provider_unittest.cc",
"browser/metrics/ios_stability_metrics_provider_unittest.mm",
"browser/metrics/previous_session_info_unittest.mm",
"browser/net/cookie_util_unittest.mm",
"browser/net/image_fetcher_unittest.mm",
"browser/net/metrics_network_client_unittest.mm",
"browser/net/retryable_url_fetcher_unittest.mm",
"browser/signin/chrome_identity_service_observer_bridge_unittest.mm",
"browser/signin/gaia_auth_fetcher_ios_unittest.mm",
"browser/snapshots/lru_cache_unittest.mm",
"browser/snapshots/snapshot_cache_unittest.mm",
"browser/snapshots/snapshots_util_unittest.mm",
"browser/translate/translate_service_ios_unittest.cc",
"browser/ui/commands/set_up_for_testing_command_unittest.mm",
"browser/ui/keyboard/UIKeyCommand+ChromeTest.mm",
"browser/ui/keyboard/hardware_keyboard_watcher_unittest.mm",
"browser/ui/native_content_controller_unittest.mm",
"browser/ui/ui_util_unittest.mm",
"browser/ui/uikit_ui_util_unittest.mm",
"browser/update_client/ios_chrome_update_query_params_delegate_unittest.cc",
"browser/web_resource/web_resource_util_unittest.cc",
"common/string_util_unittest.mm",
]

deps = [
"//base",
"//base/test:test_support",
"//base:prefs_test_support",
"//components/bookmarks/test",
"//components/enhanced_bookmarks:test_support",
"//components/favicon_base",
"//components/metrics",
"//components/metrics:test_support",
"//components/signin/core/browser:test_support",
"//components/signin/ios/browser:test_support",
"//components/sync_driver:test_support",
"//components/update_client",
"//components/version_info",
"//ios/chrome/app",
"//ios/chrome/browser",
"//ios/chrome/browser:test_support",
"//ios/chrome/common",
"//ios/public/test",
"//ios/web",
"//ios/web:test_support",
"//net:test_support",
"//skia",
"//testing/gmock",
"//testing/gtest",
"//third_party/ocmock",
"//ui/gfx:test_support",
]

# TODO(crbug.com/546283): once bundle resources are supported add code
# corresponding to the following gyp fragment:
#
# 'mac_bundle_resources': [
# 'browser/ui/native_content_controller_test.xib'
# ],
# 'actions': [
# {
# 'action_name': 'copy_ios_chrome_test_data',
# 'variables': {
# 'test_data_files': [
# 'test/data/webdata/bookmarkimages',
# ],
# 'test_data_prefix': 'ios/chrome',
# },
# 'includes': [ '../../build/copy_test_data_ios.gypi' ]
# },
# ],
# 'includes': ['ios_chrome_resources_bundle.gypi'],
}
26 changes: 26 additions & 0 deletions ios/chrome/app/BUILD.gn
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# Copyright 2015 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

source_set("app") {
sources = [
"UIApplication+ExitsOnSuspend.h",
"UIApplication+ExitsOnSuspend.mm",
"deferred_initialization_runner.h",
"deferred_initialization_runner.mm",
"safe_mode_crashing_modules_config.h",
"safe_mode_crashing_modules_config.mm",
"safe_mode_util.cc",
"safe_mode_util.h",
]

deps = [
"//base",
"//ios/chrome/browser",
]

libs = [
"Foundation.framework",
"UIKit.framework",
]
}
267 changes: 267 additions & 0 deletions ios/chrome/app/strings/BUILD.gn
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,267 @@
# Copyright 2015 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

import("//build/config/chrome_build.gni")
import("//tools/grit/grit_rule.gni")

group("strings") {
deps = [
":ios_chromium_strings",
":ios_google_chrome_strings",
":ios_locale_settings",
":ios_strings",
]
}

grit("ios_locale_settings") {
source = "ios_locale_settings.grd"
output_dir = "$root_gen_dir/ios/chrome"
use_qualified_include = true
outputs = [
"grit/ios_locale_settings.h",
"ios_locale_settings_am.pak",
"ios_locale_settings_ar.pak",
"ios_locale_settings_bg.pak",
"ios_locale_settings_bn.pak",
"ios_locale_settings_ca.pak",
"ios_locale_settings_cs.pak",
"ios_locale_settings_da.pak",
"ios_locale_settings_de.pak",
"ios_locale_settings_el.pak",
"ios_locale_settings_en-GB.pak",
"ios_locale_settings_en-US.pak",
"ios_locale_settings_es.pak",
"ios_locale_settings_es-MX.pak",
"ios_locale_settings_et.pak",
"ios_locale_settings_fa.pak",
"ios_locale_settings_fake-bidi.pak",
"ios_locale_settings_fi.pak",
"ios_locale_settings_fil.pak",
"ios_locale_settings_fr.pak",
"ios_locale_settings_gu.pak",
"ios_locale_settings_he.pak",
"ios_locale_settings_hi.pak",
"ios_locale_settings_hr.pak",
"ios_locale_settings_hu.pak",
"ios_locale_settings_id.pak",
"ios_locale_settings_it.pak",
"ios_locale_settings_ja.pak",
"ios_locale_settings_kn.pak",
"ios_locale_settings_ko.pak",
"ios_locale_settings_lt.pak",
"ios_locale_settings_lv.pak",
"ios_locale_settings_ml.pak",
"ios_locale_settings_mr.pak",
"ios_locale_settings_ms.pak",
"ios_locale_settings_nl.pak",
"ios_locale_settings_nb.pak",
"ios_locale_settings_pl.pak",
"ios_locale_settings_pt.pak",
"ios_locale_settings_pt-PT.pak",
"ios_locale_settings_ro.pak",
"ios_locale_settings_ru.pak",
"ios_locale_settings_sk.pak",
"ios_locale_settings_sl.pak",
"ios_locale_settings_sr.pak",
"ios_locale_settings_sv.pak",
"ios_locale_settings_sw.pak",
"ios_locale_settings_ta.pak",
"ios_locale_settings_te.pak",
"ios_locale_settings_th.pak",
"ios_locale_settings_tr.pak",
"ios_locale_settings_uk.pak",
"ios_locale_settings_vi.pak",
"ios_locale_settings_zh-CN.pak",
"ios_locale_settings_zh-TW.pak",
]
}

grit("ios_strings") {
source = "ios_strings.grd"
output_dir = "$root_gen_dir/ios/chrome"
use_qualified_include = true
outputs = [
"grit/ios_strings.h",
"ios_strings_am.pak",
"ios_strings_ar.pak",
"ios_strings_bg.pak",
"ios_strings_bn.pak",
"ios_strings_ca.pak",
"ios_strings_cs.pak",
"ios_strings_da.pak",
"ios_strings_de.pak",
"ios_strings_el.pak",
"ios_strings_en-GB.pak",
"ios_strings_en-US.pak",
"ios_strings_es.pak",
"ios_strings_es-MX.pak",
"ios_strings_et.pak",
"ios_strings_fa.pak",
"ios_strings_fake-bidi.pak",
"ios_strings_fi.pak",
"ios_strings_fil.pak",
"ios_strings_fr.pak",
"ios_strings_gu.pak",
"ios_strings_he.pak",
"ios_strings_hi.pak",
"ios_strings_hr.pak",
"ios_strings_hu.pak",
"ios_strings_id.pak",
"ios_strings_it.pak",
"ios_strings_ja.pak",
"ios_strings_kn.pak",
"ios_strings_ko.pak",
"ios_strings_lt.pak",
"ios_strings_lv.pak",
"ios_strings_ml.pak",
"ios_strings_mr.pak",
"ios_strings_ms.pak",
"ios_strings_nl.pak",
"ios_strings_nb.pak",
"ios_strings_pl.pak",
"ios_strings_pt.pak",
"ios_strings_pt-PT.pak",
"ios_strings_ro.pak",
"ios_strings_ru.pak",
"ios_strings_sk.pak",
"ios_strings_sl.pak",
"ios_strings_sr.pak",
"ios_strings_sv.pak",
"ios_strings_sw.pak",
"ios_strings_ta.pak",
"ios_strings_te.pak",
"ios_strings_th.pak",
"ios_strings_tr.pak",
"ios_strings_uk.pak",
"ios_strings_vi.pak",
"ios_strings_zh-CN.pak",
"ios_strings_zh-TW.pak",
]
}

grit("ios_chromium_strings") {
source = "ios_chromium_strings.grd"
output_dir = "$root_gen_dir/ios/chrome"
use_qualified_include = true
outputs = [
"grit/ios_chromium_strings.h",
"ios_chromium_strings_am.pak",
"ios_chromium_strings_ar.pak",
"ios_chromium_strings_bg.pak",
"ios_chromium_strings_bn.pak",
"ios_chromium_strings_ca.pak",
"ios_chromium_strings_cs.pak",
"ios_chromium_strings_da.pak",
"ios_chromium_strings_de.pak",
"ios_chromium_strings_el.pak",
"ios_chromium_strings_en-GB.pak",
"ios_chromium_strings_en-US.pak",
"ios_chromium_strings_es.pak",
"ios_chromium_strings_es-MX.pak",
"ios_chromium_strings_et.pak",
"ios_chromium_strings_fa.pak",
"ios_chromium_strings_fake-bidi.pak",
"ios_chromium_strings_fi.pak",
"ios_chromium_strings_fil.pak",
"ios_chromium_strings_fr.pak",
"ios_chromium_strings_gu.pak",
"ios_chromium_strings_he.pak",
"ios_chromium_strings_hi.pak",
"ios_chromium_strings_hr.pak",
"ios_chromium_strings_hu.pak",
"ios_chromium_strings_id.pak",
"ios_chromium_strings_it.pak",
"ios_chromium_strings_ja.pak",
"ios_chromium_strings_kn.pak",
"ios_chromium_strings_ko.pak",
"ios_chromium_strings_lt.pak",
"ios_chromium_strings_lv.pak",
"ios_chromium_strings_ml.pak",
"ios_chromium_strings_mr.pak",
"ios_chromium_strings_ms.pak",
"ios_chromium_strings_nl.pak",
"ios_chromium_strings_nb.pak",
"ios_chromium_strings_pl.pak",
"ios_chromium_strings_pt.pak",
"ios_chromium_strings_pt-PT.pak",
"ios_chromium_strings_ro.pak",
"ios_chromium_strings_ru.pak",
"ios_chromium_strings_sk.pak",
"ios_chromium_strings_sl.pak",
"ios_chromium_strings_sr.pak",
"ios_chromium_strings_sv.pak",
"ios_chromium_strings_sw.pak",
"ios_chromium_strings_ta.pak",
"ios_chromium_strings_te.pak",
"ios_chromium_strings_th.pak",
"ios_chromium_strings_tr.pak",
"ios_chromium_strings_uk.pak",
"ios_chromium_strings_vi.pak",
"ios_chromium_strings_zh-CN.pak",
"ios_chromium_strings_zh-TW.pak",
]
}

grit("ios_google_chrome_strings") {
source = "ios_google_chrome_strings.grd"
output_dir = "$root_gen_dir/ios/chrome"
use_qualified_include = true
outputs = [
"grit/ios_google_chrome_strings.h",
"ios_google_chrome_strings_am.pak",
"ios_google_chrome_strings_ar.pak",
"ios_google_chrome_strings_bg.pak",
"ios_google_chrome_strings_bn.pak",
"ios_google_chrome_strings_ca.pak",
"ios_google_chrome_strings_cs.pak",
"ios_google_chrome_strings_da.pak",
"ios_google_chrome_strings_de.pak",
"ios_google_chrome_strings_el.pak",
"ios_google_chrome_strings_en-GB.pak",
"ios_google_chrome_strings_en-US.pak",
"ios_google_chrome_strings_es.pak",
"ios_google_chrome_strings_es-MX.pak",
"ios_google_chrome_strings_et.pak",
"ios_google_chrome_strings_fa.pak",
"ios_google_chrome_strings_fake-bidi.pak",
"ios_google_chrome_strings_fi.pak",
"ios_google_chrome_strings_fil.pak",
"ios_google_chrome_strings_fr.pak",
"ios_google_chrome_strings_gu.pak",
"ios_google_chrome_strings_he.pak",
"ios_google_chrome_strings_hi.pak",
"ios_google_chrome_strings_hr.pak",
"ios_google_chrome_strings_hu.pak",
"ios_google_chrome_strings_id.pak",
"ios_google_chrome_strings_it.pak",
"ios_google_chrome_strings_ja.pak",
"ios_google_chrome_strings_kn.pak",
"ios_google_chrome_strings_ko.pak",
"ios_google_chrome_strings_lt.pak",
"ios_google_chrome_strings_lv.pak",
"ios_google_chrome_strings_ml.pak",
"ios_google_chrome_strings_mr.pak",
"ios_google_chrome_strings_ms.pak",
"ios_google_chrome_strings_nl.pak",
"ios_google_chrome_strings_nb.pak",
"ios_google_chrome_strings_pl.pak",
"ios_google_chrome_strings_pt.pak",
"ios_google_chrome_strings_pt-PT.pak",
"ios_google_chrome_strings_ro.pak",
"ios_google_chrome_strings_ru.pak",
"ios_google_chrome_strings_sk.pak",
"ios_google_chrome_strings_sl.pak",
"ios_google_chrome_strings_sr.pak",
"ios_google_chrome_strings_sv.pak",
"ios_google_chrome_strings_sw.pak",
"ios_google_chrome_strings_ta.pak",
"ios_google_chrome_strings_te.pak",
"ios_google_chrome_strings_th.pak",
"ios_google_chrome_strings_tr.pak",
"ios_google_chrome_strings_uk.pak",
"ios_google_chrome_strings_vi.pak",
"ios_google_chrome_strings_zh-CN.pak",
"ios_google_chrome_strings_zh-TW.pak",
]
}
Loading

0 comments on commit 0ddaed5

Please sign in to comment.