| Index: components/cronet/ios/cronet_consumer/BUILD.gn
|
| diff --git a/components/cronet/ios/cronet_consumer/BUILD.gn b/components/cronet/ios/cronet_consumer/BUILD.gn
|
| index 219318c0e0ec53fe870008cdcf090cdfc51e1d32..966057c455dd82796d8516e7b42c88d115dac48c 100644
|
| --- a/components/cronet/ios/cronet_consumer/BUILD.gn
|
| +++ b/components/cronet/ios/cronet_consumer/BUILD.gn
|
| @@ -3,61 +3,28 @@
|
| # found in the LICENSE file.
|
|
|
| import("//build/config/ios/rules.gni")
|
| -import("//ios/features.gni")
|
|
|
| -template("cronet_consumer_template") {
|
| - _target_name = target_name
|
| +ios_app_bundle("cronet_consumer") {
|
| + info_plist = "cronet-consumer-Info.plist"
|
|
|
| - ios_app_bundle(_target_name) {
|
| - info_plist = "cronet-consumer-Info.plist"
|
| + deps = [
|
| + "//base:base",
|
| + "//components/cronet/ios:cronet_framework+link",
|
|
|
| - deps = [
|
| - "//base:base",
|
| - ]
|
| + # All shared libraries must have the sanitizer deps to properly link in
|
| + # asan mode (this target will be empty in other cases).
|
| + "//build/config:exe_and_shlib_deps",
|
| + ]
|
|
|
| - deps += invoker.deps
|
| + sources = [
|
| + "cronet_consumer_app_delegate.h",
|
| + "cronet_consumer_app_delegate.mm",
|
| + "cronet_consumer_view_controller.h",
|
| + "cronet_consumer_view_controller.m",
|
| + "main.mm",
|
| + ]
|
|
|
| - sources = [
|
| - "cronet_consumer_app_delegate.h",
|
| - "cronet_consumer_app_delegate.mm",
|
| - "cronet_consumer_view_controller.h",
|
| - "cronet_consumer_view_controller.m",
|
| - "main.mm",
|
| - ]
|
| + bundle_deps = [ "//components/cronet/ios:cronet_framework+bundle" ]
|
|
|
| - forward_variables_from(invoker,
|
| - [
|
| - "bundle_deps",
|
| - "cflags",
|
| - "ldflags",
|
| - ])
|
| -
|
| - configs += [ "//build/config/compiler:enable_arc" ]
|
| - }
|
| + configs += [ "//build/config/compiler:enable_arc" ]
|
| }
|
| -
|
| -cronet_consumer_template("cronet_consumer") {
|
| - deps = [
|
| - "//components/cronet/ios:cronet_framework+link",
|
| - ]
|
| - bundle_deps = [ "//components/cronet/ios:cronet_framework+bundle" ]
|
| -}
|
| -
|
| -# TODO(mef): Figure out why CronetConsumerStatic breaks build on non-Cronet builders.
|
| -if (is_cronet_build) {
|
| - cronet_consumer_template("cronet_consumer_static") {
|
| - deps = [
|
| - "//components/cronet/ios:cronet_static_framework",
|
| - ]
|
| -
|
| - cflags = [
|
| - "-F",
|
| - "Static",
|
| - ]
|
| -
|
| - ldflags = [
|
| - "-F",
|
| - "Static",
|
| - ]
|
| - }
|
| -}
|
|
|