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

Unified Diff: ios/chrome/BUILD.gn

Issue 1880393004: [iOS/GN] Fix ios_chrome_unittests to pass when build with gn. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gn-symlink
Patch Set: Created 4 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/config/ios/rules.gni ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/chrome/BUILD.gn
diff --git a/ios/chrome/BUILD.gn b/ios/chrome/BUILD.gn
index d13d817620a88e4b05e56c9e2e93f4cbd6e6235a..d7843da2c54b8bb07dfed36c16769547f00e2b7b 100644
--- a/ios/chrome/BUILD.gn
+++ b/ios/chrome/BUILD.gn
@@ -2,8 +2,26 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("//build/config/ios/rules.gni")
import("//testing/test.gni")
+bundle_data("ios_chrome_unittests_bundle_data") {
+ testonly = true
+ sources = [
+ "test/data/webdata/bookmarkimages/image.jpg",
+ "test/data/webdata/bookmarkimages/index.html",
+ ]
+ outputs = [
+ "{{bundle_resources_dir}}/{{source_root_relative_dir}}/" +
+ "{{source_file_part}}",
+ ]
+}
+
+bundle_data_xib("native_content_controller_test_xib") {
+ testonly = true
+ source = "browser/ui/native_content_controller_test.xib"
+}
+
test("ios_chrome_unittests") {
sources = [
"app/safe_mode_util_unittest.cc",
@@ -44,6 +62,8 @@ test("ios_chrome_unittests") {
]
deps = [
+ ":ios_chrome_unittests_bundle_data",
+ ":native_content_controller_test_xib",
"//base",
"//base/test:test_support",
"//components/bookmarks/test",
@@ -73,24 +93,4 @@ test("ios_chrome_unittests") {
"//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'],
}
« no previous file with comments | « build/config/ios/rules.gni ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698