Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2015 The Chromium Authors. All rights reserved. | 1 # Copyright 2015 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("//ios/web/js_compile.gni") | 5 import("//ios/web/js_compile.gni") |
| 6 import("//testing/test.gni") | 6 import("//testing/test.gni") |
| 7 import("//tools/grit/grit_rule.gni") | 7 import("//tools/grit/grit_rule.gni") |
| 8 | 8 |
| 9 source_set("web") { | 9 source_set("web") { |
| 10 deps = [ | 10 deps = [ |
| (...skipping 454 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 465 "webui/crw_web_ui_page_builder_unittest.mm", | 465 "webui/crw_web_ui_page_builder_unittest.mm", |
| 466 "webui/mojo_facade_unittest.mm", | 466 "webui/mojo_facade_unittest.mm", |
| 467 "webui/url_fetcher_block_adapter_unittest.mm", | 467 "webui/url_fetcher_block_adapter_unittest.mm", |
| 468 ] | 468 ] |
| 469 } | 469 } |
| 470 | 470 |
| 471 test("ios_web_inttests") { | 471 test("ios_web_inttests") { |
| 472 deps = [ | 472 deps = [ |
| 473 ":test_support", | 473 ":test_support", |
| 474 ":web", | 474 ":web", |
| 475 "test:mojo_bindings", | |
|
sdefresne
2016/05/28 13:04:01
Please only use relative name for target defined i
Eugene But (OOO till 7-30)
2016/05/31 17:26:57
Done.
| |
| 476 "test:packed_resources", | |
| 477 "test:resources", | |
| 475 "//base/test:test_support", | 478 "//base/test:test_support", |
| 479 "//ios/public/provider/web", | |
| 476 "//mojo/edk/system", | 480 "//mojo/edk/system", |
| 477 "//net:test_support", | 481 "//net:test_support", |
| 482 "//services/shell/public/cpp", | |
| 478 "//testing/gtest", | 483 "//testing/gtest", |
| 479 "//ui/base:test_support", | 484 "//ui/base:test_support", |
| 480 ] | 485 ] |
| 481 sources = [ | 486 sources = [ |
| 482 "browser_state_web_view_partition_inttest.mm", | 487 "browser_state_web_view_partition_inttest.mm", |
| 483 "public/test/http_server_inttest.mm", | 488 "public/test/http_server_inttest.mm", |
| 484 "test/run_all_unittests.cc", | 489 "test/run_all_unittests.cc", |
| 490 "webui/web_ui_mojo_inttest.mm", | |
| 485 ] | 491 ] |
| 486 } | 492 } |
| 487 | 493 |
| 488 js_compile_bundle("web_ui_bundle") { | 494 js_compile_bundle("web_ui_bundle") { |
| 489 visibility = [ ":js_resources" ] | 495 visibility = [ ":js_resources" ] |
| 490 closure_entry_point = "__crWeb.webUIBundle" | 496 closure_entry_point = "__crWeb.webUIBundle" |
| 491 | 497 |
| 492 sources = [ | 498 sources = [ |
| 493 "../third_party/requirejs/require.js", | 499 "../third_party/requirejs/require.js", |
| 494 "webui/resources/web_ui_base.js", | 500 "webui/resources/web_ui_base.js", |
| (...skipping 27 matching lines...) Expand all Loading... | |
| 522 ] | 528 ] |
| 523 | 529 |
| 524 sources = [ | 530 sources = [ |
| 525 "web_state/js/resources/plugin_placeholder.js", | 531 "web_state/js/resources/plugin_placeholder.js", |
| 526 "web_state/js/resources/post_request.js", | 532 "web_state/js/resources/post_request.js", |
| 527 "web_state/js/resources/window_id.js", | 533 "web_state/js/resources/window_id.js", |
| 528 ] | 534 ] |
| 529 } | 535 } |
| 530 | 536 |
| 531 grit("resources") { | 537 grit("resources") { |
| 532 source = "ios_web_resources.grd" | 538 source = "ios_web_resources.grd" |
|
sdefresne
2016/05/28 13:04:02
testonly = true
Eugene But (OOO till 7-30)
2016/05/31 17:26:56
This is not test only thing. This is for productio
sdefresne
2016/05/31 18:52:25
I made this comment because the only grd file that
| |
| 533 use_qualified_include = true | 539 use_qualified_include = true |
|
sdefresne
2016/05/28 13:04:01
There is an indirect dependency on generated file
Eugene But (OOO till 7-30)
2016/05/31 17:26:57
ditto. This target does not contain any test resou
| |
| 534 outputs = [ | 540 outputs = [ |
| 535 "grit/ios_web_resources.h", | 541 "grit/ios_web_resources.h", |
| 536 "ios_web_resources.pak", | 542 "ios_web_resources.pak", |
| 537 ] | 543 ] |
| 538 grit_flags = [ | 544 grit_flags = [ |
| 539 "-E", | 545 "-E", |
| 540 "root_out_dir=" + rebase_path(root_out_dir, root_build_dir), | 546 "root_gen_dir=" + rebase_path(root_out_dir, root_build_dir), |
|
sdefresne
2016/05/28 13:04:02
You want to have the grit variable "root_gen_dir"
Eugene But (OOO till 7-30)
2016/05/31 17:26:57
Done. Thank you for explanation!
| |
| 541 ] | 547 ] |
| 542 } | 548 } |
| OLD | NEW |