Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2016 The Chromium Authors. All rights reserved. | 1 # Copyright 2016 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/chrome_build.gni") | |
| 6 | |
| 5 assert(!is_component_build, "component build is unsupported on iOS") | 7 assert(!is_component_build, "component build is unsupported on iOS") |
| 6 | 8 |
| 7 declare_args() { | 9 declare_args() { |
| 8 # Control whether cronet is build (this is usually set by the script | 10 # Control whether cronet is build (this is usually set by the script |
| 9 # components/cronet/tools/cr_cronet.py as cronet requires specific | 11 # components/cronet/tools/cr_cronet.py as cronet requires specific |
| 10 # gn args to build correctly). | 12 # gn args to build correctly). |
| 11 is_cronet_build = false | 13 is_cronet_build = false |
| 12 } | 14 } |
| 13 | 15 |
| 14 # This list all targets that needs to be build as part of "gn_all" on iOS. | 16 # This list all targets that needs to be build as part of "gn_all" on iOS. |
| (...skipping 19 matching lines...) Expand all Loading... | |
| 34 | 36 |
| 35 # List all the test targets that need to be build on iOS by default. | 37 # List all the test targets that need to be build on iOS by default. |
| 36 "//ios/chrome/test:all_tests", | 38 "//ios/chrome/test:all_tests", |
| 37 "//ios/chrome/test/earl_grey:all_tests", | 39 "//ios/chrome/test/earl_grey:all_tests", |
| 38 "//ios/net:all_tests", | 40 "//ios/net:all_tests", |
| 39 "//ios/showcase:all_tests", | 41 "//ios/showcase:all_tests", |
| 40 "//ios/testing:all_tests", | 42 "//ios/testing:all_tests", |
| 41 "//ios/web:all_tests", | 43 "//ios/web:all_tests", |
| 42 "//ios/web/shell/test:all_tests", | 44 "//ios/web/shell/test:all_tests", |
| 43 | 45 |
| 44 # Those dependencies are currently only used from downstream code | 46 # today_extension and share_extension dependencies are currently |
| 45 # and will be removed once the dependent code has been upstreamed. | 47 # only used from downstream code and will be removed once the |
| 48 # dependent code has been upstreamed. | |
|
Olivier
2017/01/17 10:13:05
I think we can remove this.
Can you see with sdefr
sdefresne
2017/01/17 10:39:07
Yes, just revert the whole file. I'll remove the d
lody
2017/01/17 17:31:45
Done.
| |
| 46 "//ios/chrome/share_extension", | 49 "//ios/chrome/share_extension", |
| 47 "//ios/chrome/today_extension", | |
| 48 ] | 50 ] |
| 51 if (!ios_enable_today_extension && ios_enable_proto_today_extension) { | |
|
Olivier
2017/01/17 10:13:05
This will add dep to today_extension if both flags
lody
2017/01/17 17:31:45
Acknowledged.
| |
| 52 deps += [ "//ios/chrome/proto_today_extension" ] | |
| 53 } else { | |
| 54 deps += [ "//ios/chrome/today_extension" ] | |
| 55 } | |
| 49 } | 56 } |
| 50 } | 57 } |
| OLD | NEW |