| 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/build/config.gni") |    5 import("//ios/build/config.gni") | 
|    6 import("//ios/web/js_compile.gni") |    6 import("//ios/web/js_compile.gni") | 
|    7 import("//testing/test.gni") |    7 import("//testing/test.gni") | 
|    8 import("//tools/grit/grit_rule.gni") |    8 import("//tools/grit/grit_rule.gni") | 
|    9  |    9  | 
|   10 group("all_tests") { |   10 group("all_tests") { | 
|   11   testonly = true |   11   testonly = true | 
|   12   deps = [ |   12   deps = [ | 
|   13     ":ios_web_inttests", |   13     ":ios_web_inttests", | 
|   14     ":ios_web_unittests", |   14     ":ios_web_unittests", | 
|   15   ] |   15   ] | 
|   16 } |   16 } | 
|   17  |   17  | 
|   18 source_set("web_arc") { |   18 source_set("web_arc") { | 
|   19   deps = [ |   19   deps = [ | 
|   20     ":core", |   20     ":core", | 
|   21     ":js_resources", |   21     ":js_resources", | 
 |   22     ":reload_type", | 
|   22     ":resources", |   23     ":resources", | 
|   23     ":user_agent", |   24     ":user_agent", | 
|   24     "//base", |   25     "//base", | 
|   25     "//components/payments/core", |   26     "//components/payments/core", | 
|   26     "//components/url_formatter", |   27     "//components/url_formatter", | 
|   27     "//ios/net", |   28     "//ios/net", | 
|   28     "//ios/third_party/blink:html_tokenizer", |   29     "//ios/third_party/blink:html_tokenizer", | 
|   29     "//mojo/public/cpp/system", |   30     "//mojo/public/cpp/system", | 
|   30     "//mojo/public/js", |   31     "//mojo/public/js", | 
|   31     "//net", |   32     "//net", | 
| (...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  250  |  251  | 
|  251   libs = [ "WebKit.framework" ] |  252   libs = [ "WebKit.framework" ] | 
|  252  |  253  | 
|  253   configs += [ "//build/config/compiler:enable_arc" ] |  254   configs += [ "//build/config/compiler:enable_arc" ] | 
|  254 } |  255 } | 
|  255  |  256  | 
|  256 source_set("web") { |  257 source_set("web") { | 
|  257   deps = [ |  258   deps = [ | 
|  258     ":core", |  259     ":core", | 
|  259     ":js_resources", |  260     ":js_resources", | 
 |  261     ":reload_type", | 
|  260     ":resources", |  262     ":resources", | 
|  261     ":user_agent", |  263     ":user_agent", | 
|  262     "//base", |  264     "//base", | 
|  263     "//components/url_formatter", |  265     "//components/url_formatter", | 
|  264     "//ios/net", |  266     "//ios/net", | 
|  265     "//ios/third_party/blink:html_tokenizer", |  267     "//ios/third_party/blink:html_tokenizer", | 
|  266     "//mojo/public/cpp/system", |  268     "//mojo/public/cpp/system", | 
|  267     "//mojo/public/js", |  269     "//mojo/public/js", | 
|  268     "//net", |  270     "//net", | 
|  269     "//services/service_manager/public/cpp", |  271     "//services/service_manager/public/cpp", | 
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  338   ] |  340   ] | 
|  339  |  341  | 
|  340   sources = [ |  342   sources = [ | 
|  341     "public/user_agent.h", |  343     "public/user_agent.h", | 
|  342     "public/user_agent.mm", |  344     "public/user_agent.mm", | 
|  343   ] |  345   ] | 
|  344  |  346  | 
|  345   configs += [ "//build/config/compiler:enable_arc" ] |  347   configs += [ "//build/config/compiler:enable_arc" ] | 
|  346 } |  348 } | 
|  347  |  349  | 
 |  350 source_set("reload_type") { | 
 |  351   sources = [ | 
 |  352     "public/reload_type.h", | 
 |  353   ] | 
 |  354 } | 
 |  355  | 
|  348 source_set("earl_grey_test_support") { |  356 source_set("earl_grey_test_support") { | 
|  349   testonly = true |  357   testonly = true | 
|  350  |  358  | 
|  351   deps = [ |  359   deps = [ | 
|  352     ":test_support", |  360     ":test_support", | 
|  353     ":web", |  361     ":web", | 
|  354     "//base", |  362     "//base", | 
|  355     "//base/test:test_support", |  363     "//base/test:test_support", | 
|  356     "//ios/testing:ios_test_support", |  364     "//ios/testing:ios_test_support", | 
|  357     "//ios/testing/earl_grey:earl_grey_support", |  365     "//ios/testing/earl_grey:earl_grey_support", | 
| (...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  671     "ios_web_resources.pak", |  679     "ios_web_resources.pak", | 
|  672   ] |  680   ] | 
|  673   grit_flags = [ |  681   grit_flags = [ | 
|  674     "-E", |  682     "-E", | 
|  675     "root_gen_dir=" + rebase_path(root_gen_dir, root_build_dir), |  683     "root_gen_dir=" + rebase_path(root_gen_dir, root_build_dir), | 
|  676   ] |  684   ] | 
|  677   deps = [ |  685   deps = [ | 
|  678     "//mojo/public/js:bindings", |  686     "//mojo/public/js:bindings", | 
|  679   ] |  687   ] | 
|  680 } |  688 } | 
| OLD | NEW |