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", | |
| 476 "test:repacked_resources", | |
| 475 "//base/test:test_support", | 477 "//base/test:test_support", |
| 478 "//ios/public/provider/web", | |
| 479 "//ios/web/test:resources", | |
| 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", | |
| 491 ] | |
| 492 data = [ | |
|
sdefresne
2016/05/26 17:45:18
"data" is not used in iOS, remove.
If you want th
Eugene But (OOO till 7-30)
2016/05/26 20:53:32
Done.
| |
| 493 "$root_gen_dir/ios/web/test/resources.pak", | |
| 485 ] | 494 ] |
| 486 } | 495 } |
| 487 | 496 |
| 488 js_compile_bundle("web_ui_bundle") { | 497 js_compile_bundle("web_ui_bundle") { |
| 489 visibility = [ ":js_resources" ] | 498 visibility = [ ":js_resources" ] |
| 490 closure_entry_point = "__crWeb.webUIBundle" | 499 closure_entry_point = "__crWeb.webUIBundle" |
| 491 | 500 |
| 492 sources = [ | 501 sources = [ |
| 493 "../third_party/requirejs/require.js", | 502 "../third_party/requirejs/require.js", |
| 494 "webui/resources/web_ui_base.js", | 503 "webui/resources/web_ui_base.js", |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 532 source = "ios_web_resources.grd" | 541 source = "ios_web_resources.grd" |
| 533 use_qualified_include = true | 542 use_qualified_include = true |
| 534 outputs = [ | 543 outputs = [ |
| 535 "grit/ios_web_resources.h", | 544 "grit/ios_web_resources.h", |
| 536 "ios_web_resources.pak", | 545 "ios_web_resources.pak", |
| 537 ] | 546 ] |
| 538 grit_flags = [ | 547 grit_flags = [ |
| 539 "-E", | 548 "-E", |
| 540 "root_out_dir=" + rebase_path(root_out_dir, root_build_dir), | 549 "root_out_dir=" + rebase_path(root_out_dir, root_build_dir), |
| 541 ] | 550 ] |
| 551 output_dir = "$root_gen_dir/ios/web" | |
|
sdefresne
2016/05/26 17:45:18
This should not be necessary, output_dir defaults
Eugene But (OOO till 7-30)
2016/05/26 20:53:32
Done.
| |
| 542 } | 552 } |
| OLD | NEW |