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("//build/config/ios/rules.gni") | 5 import("//build/config/ios/rules.gni") |
| 6 | 6 |
| 7 ios_app_bundle("cronet_consumer") { | 7 template("cronet_consumer_template") { |
| 8 info_plist = "cronet-consumer-Info.plist" | 8 _target_name = target_name |
| 9 | 9 |
| 10 ios_app_bundle(_target_name) { | |
| 11 info_plist = "cronet-consumer-Info.plist" | |
| 12 | |
| 13 deps = [ | |
| 14 "//base:base", | |
| 15 | |
| 16 # All shared libraries must have the sanitizer deps to properly link in | |
| 17 # asan mode (this target will be empty in other cases). | |
| 18 "//build/config/sanitizers:deps", | |
| 19 ] | |
| 20 | |
| 21 deps += invoker.deps | |
| 22 | |
| 23 if (defined(invoker.bundle_deps)) { | |
| 24 bundle_deps = invoker.bundle_deps | |
| 25 } | |
| 26 | |
| 27 sources = [ | |
| 28 "cronet_consumer_app_delegate.h", | |
| 29 "cronet_consumer_app_delegate.mm", | |
| 30 "cronet_consumer_view_controller.h", | |
| 31 "cronet_consumer_view_controller.m", | |
| 32 "main.mm", | |
| 33 ] | |
| 34 | |
| 35 configs += [ "//build/config/compiler:enable_arc" ] | |
| 36 } | |
| 37 } | |
| 38 | |
| 39 cronet_consumer_template("cronet_consumer") { | |
| 10 deps = [ | 40 deps = [ |
| 11 "//base:base", | |
| 12 "//components/cronet/ios:cronet_framework+link", | 41 "//components/cronet/ios:cronet_framework+link", |
| 42 ] | |
| 43 bundle_deps = [ "//components/cronet/ios:cronet_framework+bundle" ] | |
| 44 } | |
| 13 | 45 |
| 14 # All shared libraries must have the sanitizer deps to properly link in | 46 cronet_consumer_template("cronet_consumer_static") { |
| 15 # asan mode (this target will be empty in other cases). | 47 deps = [ |
| 16 "//build/config:exe_and_shlib_deps", | 48 # TODO(mef): This dep is used to make #import <Cronet/Cronet.h> work. |
|
kapishnikov
2017/05/23 21:37:46
I think we should fix it. Linking two frameworks d
jzw1
2017/05/24 06:15:26
Might be related, but when I build this on device
mef
2017/05/24 21:36:59
Yes, I think it is a result of linking cronet_fram
mef
2017/05/24 21:36:59
I agree that it is not great, and will be happy to
| |
| 49 # Fix cronet_static_framework to provide similar config. | |
| 50 "//components/cronet/ios:cronet_framework+link", | |
| 51 "//components/cronet/ios:cronet_static_framework", | |
| 17 ] | 52 ] |
| 18 | |
| 19 sources = [ | |
| 20 "cronet_consumer_app_delegate.h", | |
| 21 "cronet_consumer_app_delegate.mm", | |
| 22 "cronet_consumer_view_controller.h", | |
| 23 "cronet_consumer_view_controller.m", | |
| 24 "main.mm", | |
| 25 ] | |
| 26 | |
| 27 bundle_deps = [ "//components/cronet/ios:cronet_framework+bundle" ] | |
| 28 | |
| 29 configs += [ "//build/config/compiler:enable_arc" ] | |
| 30 } | 53 } |
| OLD | NEW |