Commit fc94d642 authored by Sylvain Defresne's avatar Sylvain Defresne Committed by Commit Bot

[ios] Convert GN libs lists to frameworks in //ios/chrome.

GN recently added support for Apple frameworks to link, rather than
overloading the libs lists. This pulls .frameworks out of the libs
lists, so that GN can stop supporting .frameworks in libs in the
future.

Bug: 1052560
Change-Id: Id20cfc5e36fc4566ca6a7a408a577affed09c4ec
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2277725
Auto-Submit: Sylvain Defresne <sdefresne@chromium.org>
Commit-Queue: Mark Cogan <marq@chromium.org>
Reviewed-by: default avatarMark Cogan <marq@chromium.org>
Cr-Commit-Position: refs/heads/master@{#784405}
parent 9bcc8056
...@@ -27,7 +27,7 @@ source_set("app") { ...@@ -27,7 +27,7 @@ source_set("app") {
"//url", "//url",
] ]
libs = [ "Foundation.framework" ] frameworks = [ "Foundation.framework" ]
} }
source_set("unit_tests") { source_set("unit_tests") {
...@@ -261,7 +261,7 @@ source_set("app_internal") { ...@@ -261,7 +261,7 @@ source_set("app_internal") {
"//ui/strings:ui_strings", "//ui/strings:ui_strings",
] ]
libs = [ frameworks = [
"CoreSpotlight.framework", "CoreSpotlight.framework",
"MediaPlayer.framework", "MediaPlayer.framework",
] ]
......
...@@ -20,7 +20,7 @@ source_set("application_delegate") { ...@@ -20,7 +20,7 @@ source_set("application_delegate") {
"//ios/chrome/browser/crash_report", "//ios/chrome/browser/crash_report",
"//ios/chrome/browser/metrics", "//ios/chrome/browser/metrics",
] ]
libs = [ "Foundation.framework" ] frameworks = [ "Foundation.framework" ]
configs += [ "//build/config/compiler:enable_arc" ] configs += [ "//build/config/compiler:enable_arc" ]
} }
...@@ -95,7 +95,7 @@ source_set("unit_tests") { ...@@ -95,7 +95,7 @@ source_set("unit_tests") {
"//ui/base", "//ui/base",
"//url", "//url",
] ]
libs = [ "CoreSpotlight.framework" ] frameworks = [ "CoreSpotlight.framework" ]
} }
source_set("tab_opening") { source_set("tab_opening") {
...@@ -111,7 +111,7 @@ source_set("tab_opening") { ...@@ -111,7 +111,7 @@ source_set("tab_opening") {
"//ios/chrome/browser/main:public", "//ios/chrome/browser/main:public",
"//ui/base", "//ui/base",
] ]
libs = [ frameworks = [
"CoreSpotlight.framework", "CoreSpotlight.framework",
"UIKit.framework", "UIKit.framework",
] ]
...@@ -134,7 +134,7 @@ source_set("metric_kit_subscriber") { ...@@ -134,7 +134,7 @@ source_set("metric_kit_subscriber") {
"metric_kit_subscribing_util.h", "metric_kit_subscribing_util.h",
"metric_kit_subscribing_util.mm", "metric_kit_subscribing_util.mm",
] ]
libs = [ "MetricKit.framework" ] frameworks = [ "MetricKit.framework" ]
deps = [ deps = [
":ios_enable_metrickit_buildflags", ":ios_enable_metrickit_buildflags",
"//base", "//base",
...@@ -214,7 +214,7 @@ source_set("application_delegate_internal") { ...@@ -214,7 +214,7 @@ source_set("application_delegate_internal") {
if (ios_enable_metrickit) { if (ios_enable_metrickit) {
deps += [ ":metric_kit_subscriber" ] deps += [ ":metric_kit_subscriber" ]
} }
libs = [ frameworks = [
"CoreSpotlight.framework", "CoreSpotlight.framework",
"UIKit.framework", "UIKit.framework",
] ]
...@@ -249,5 +249,5 @@ source_set("test_support") { ...@@ -249,5 +249,5 @@ source_set("test_support") {
"//ui/base", "//ui/base",
"//url", "//url",
] ]
libs = [ "UIKit.framework" ] frameworks = [ "UIKit.framework" ]
} }
...@@ -10,7 +10,7 @@ source_set("intents") { ...@@ -10,7 +10,7 @@ source_set("intents") {
"SearchInChromeIntent.m", "SearchInChromeIntent.m",
] ]
deps = [ ":resources" ] deps = [ ":resources" ]
libs = [ "Intents.framework" ] frameworks = [ "Intents.framework" ]
configs += [ "//build/config/compiler:enable_arc" ] configs += [ "//build/config/compiler:enable_arc" ]
} }
......
...@@ -44,7 +44,7 @@ source_set("spotlight") { ...@@ -44,7 +44,7 @@ source_set("spotlight") {
"//ui/base", "//ui/base",
"//url", "//url",
] ]
libs = [ frameworks = [
"CoreSpotlight.framework", "CoreSpotlight.framework",
"UIKit.framework", "UIKit.framework",
] ]
...@@ -69,5 +69,5 @@ source_set("unit_tests") { ...@@ -69,5 +69,5 @@ source_set("unit_tests") {
"//net", "//net",
"//testing/gtest", "//testing/gtest",
] ]
libs = [ "CoreSpotlight.framework" ] frameworks = [ "CoreSpotlight.framework" ]
} }
...@@ -28,7 +28,7 @@ source_set("common") { ...@@ -28,7 +28,7 @@ source_set("common") {
public_deps = [ ":timing" ] public_deps = [ ":timing" ]
libs = [ "QuartzCore.framework" ] frameworks = [ "QuartzCore.framework" ]
} }
source_set("timing") { source_set("timing") {
...@@ -37,7 +37,7 @@ source_set("timing") { ...@@ -37,7 +37,7 @@ source_set("timing") {
"material_timing.mm", "material_timing.mm",
] ]
libs = [ "QuartzCore.framework" ] frameworks = [ "QuartzCore.framework" ]
configs += [ "//build/config/compiler:enable_arc" ] configs += [ "//build/config/compiler:enable_arc" ]
} }
......
...@@ -23,7 +23,7 @@ source_set("credential_provider") { ...@@ -23,7 +23,7 @@ source_set("credential_provider") {
"//ios/chrome/common:ios_app_bundle_id_prefix_buildflags", "//ios/chrome/common:ios_app_bundle_id_prefix_buildflags",
"//ios/chrome/common/app_group", "//ios/chrome/common/app_group",
] ]
libs = [ frameworks = [
"AuthenticationServices.framework", "AuthenticationServices.framework",
"Foundation.framework", "Foundation.framework",
] ]
...@@ -35,7 +35,7 @@ source_set("ui") { ...@@ -35,7 +35,7 @@ source_set("ui") {
"credential.h", "credential.h",
"credential_store.h", "credential_store.h",
] ]
libs = [ "Foundation.framework" ] frameworks = [ "Foundation.framework" ]
} }
source_set("unit_tests") { source_set("unit_tests") {
......
...@@ -19,7 +19,7 @@ source_set("confirmation_alert") { ...@@ -19,7 +19,7 @@ source_set("confirmation_alert") {
"//ios/chrome/common/ui/util", "//ios/chrome/common/ui/util",
"//ios/chrome/common/ui/util:dynamic_type_util", "//ios/chrome/common/ui/util:dynamic_type_util",
] ]
libs = [ "UIKit.framework" ] frameworks = [ "UIKit.framework" ]
} }
imageset("confirmation_alert_ic_help") { imageset("confirmation_alert_ic_help") {
......
...@@ -11,7 +11,7 @@ source_set("elements") { ...@@ -11,7 +11,7 @@ source_set("elements") {
"highlight_button.mm", "highlight_button.mm",
] ]
libs = [ "UIKit.framework" ] frameworks = [ "UIKit.framework" ]
deps = [ "//ios/chrome/common:timing" ] deps = [ "//ios/chrome/common:timing" ]
...@@ -24,7 +24,7 @@ source_set("popover_label_view_controller") { ...@@ -24,7 +24,7 @@ source_set("popover_label_view_controller") {
"popover_label_view_controller.mm", "popover_label_view_controller.mm",
] ]
libs = [ "UIKit.framework" ] frameworks = [ "UIKit.framework" ]
deps = [ deps = [
"//ios/chrome/common/ui/colors", "//ios/chrome/common/ui/colors",
......
...@@ -27,7 +27,7 @@ source_set("dynamic_type_util") { ...@@ -27,7 +27,7 @@ source_set("dynamic_type_util") {
"dynamic_type_util.h", "dynamic_type_util.h",
"dynamic_type_util.mm", "dynamic_type_util.mm",
] ]
libs = [ "UIKit.framework" ] frameworks = [ "UIKit.framework" ]
} }
source_set("unit_tests") { source_set("unit_tests") {
......
...@@ -61,7 +61,7 @@ source_set("content_widget") { ...@@ -61,7 +61,7 @@ source_set("content_widget") {
"//ios/chrome/common/ui/util", "//ios/chrome/common/ui/util",
] ]
libs = [ frameworks = [
"Foundation.framework", "Foundation.framework",
"NotificationCenter.framework", "NotificationCenter.framework",
"UIKit.framework", "UIKit.framework",
......
...@@ -69,7 +69,7 @@ ios_appex_bundle("credential_provider_extension") { ...@@ -69,7 +69,7 @@ ios_appex_bundle("credential_provider_extension") {
assert_no_deps = ios_extension_assert_no_deps assert_no_deps = ios_extension_assert_no_deps
libs = [ frameworks = [
"AuthenticationServices.framework", "AuthenticationServices.framework",
"Foundation.framework", "Foundation.framework",
"UIKit.framework", "UIKit.framework",
...@@ -140,7 +140,7 @@ source_set("password_util") { ...@@ -140,7 +140,7 @@ source_set("password_util") {
"//base", "//base",
"//ios/chrome/common/app_group", "//ios/chrome/common/app_group",
] ]
libs = [ frameworks = [
"Security.framework", "Security.framework",
"Foundation.framework", "Foundation.framework",
] ]
...@@ -156,7 +156,7 @@ source_set("metrics_util") { ...@@ -156,7 +156,7 @@ source_set("metrics_util") {
"//base", "//base",
"//ios/chrome/common/app_group", "//ios/chrome/common/app_group",
] ]
libs = [ "Foundation.framework" ] frameworks = [ "Foundation.framework" ]
} }
source_set("account_verification_provider") { source_set("account_verification_provider") {
...@@ -164,14 +164,14 @@ source_set("account_verification_provider") { ...@@ -164,14 +164,14 @@ source_set("account_verification_provider") {
deps = [ ios_account_verification_provider_target ] deps = [ ios_account_verification_provider_target ]
assert_no_deps = [ "//ios/chrome/browser/*" ] assert_no_deps = [ "//ios/chrome/browser/*" ]
configs += [ "//build/config/compiler:enable_arc" ] configs += [ "//build/config/compiler:enable_arc" ]
libs = [ "Foundation.framework" ] frameworks = [ "Foundation.framework" ]
} }
source_set("account_verification_provider_header") { source_set("account_verification_provider_header") {
sources = [ "account_verification_provider.h" ] sources = [ "account_verification_provider.h" ]
assert_no_deps = [ "//ios/chrome/browser/*" ] assert_no_deps = [ "//ios/chrome/browser/*" ]
configs += [ "//build/config/compiler:enable_arc" ] configs += [ "//build/config/compiler:enable_arc" ]
libs = [ "Foundation.framework" ] frameworks = [ "Foundation.framework" ]
} }
source_set("account_verification_provider_implementation") { source_set("account_verification_provider_implementation") {
...@@ -179,5 +179,5 @@ source_set("account_verification_provider_implementation") { ...@@ -179,5 +179,5 @@ source_set("account_verification_provider_implementation") {
deps = [ ":account_verification_provider_header" ] deps = [ ":account_verification_provider_header" ]
assert_no_deps = [ "//ios/chrome/browser/*" ] assert_no_deps = [ "//ios/chrome/browser/*" ]
configs += [ "//build/config/compiler:enable_arc" ] configs += [ "//build/config/compiler:enable_arc" ]
libs = [ "Foundation.framework" ] frameworks = [ "Foundation.framework" ]
} }
...@@ -40,7 +40,7 @@ source_set("ui") { ...@@ -40,7 +40,7 @@ source_set("ui") {
"//ios/chrome/credential_provider_extension:reauthentication_handler", "//ios/chrome/credential_provider_extension:reauthentication_handler",
"//ios/chrome/credential_provider_extension/ui/resources", "//ios/chrome/credential_provider_extension/ui/resources",
] ]
libs = [ frameworks = [
"UIKit.framework", "UIKit.framework",
"AuthenticationServices.framework", "AuthenticationServices.framework",
] ]
...@@ -56,7 +56,7 @@ source_set("utils") { ...@@ -56,7 +56,7 @@ source_set("utils") {
"//base", "//base",
"//ios/chrome/common/ui/colors", "//ios/chrome/common/ui/colors",
] ]
libs = [ frameworks = [
"UIKit.framework", "UIKit.framework",
"QuartzCore.framework", "QuartzCore.framework",
] ]
......
...@@ -68,7 +68,7 @@ source_set("search_widget") { ...@@ -68,7 +68,7 @@ source_set("search_widget") {
"//ios/chrome/common/ui/util", "//ios/chrome/common/ui/util",
] ]
libs = [ frameworks = [
"Foundation.framework", "Foundation.framework",
"NotificationCenter.framework", "NotificationCenter.framework",
"UIKit.framework", "UIKit.framework",
......
...@@ -57,7 +57,7 @@ ios_appex_bundle("share_extension") { ...@@ -57,7 +57,7 @@ ios_appex_bundle("share_extension") {
assert_no_deps = ios_extension_assert_no_deps assert_no_deps = ios_extension_assert_no_deps
libs = [ frameworks = [
"Foundation.framework", "Foundation.framework",
"Social.framework", "Social.framework",
"CoreGraphics.framework", "CoreGraphics.framework",
......
...@@ -85,7 +85,7 @@ source_set("eg_test_support+eg2") { ...@@ -85,7 +85,7 @@ source_set("eg_test_support+eg2") {
"//ios/testing/earl_grey:eg_test_support+eg2", "//ios/testing/earl_grey:eg_test_support+eg2",
"//ios/third_party/earl_grey2:test_lib", "//ios/third_party/earl_grey2:test_lib",
] ]
libs = [ "XCTest.framework" ] frameworks = [ "XCTest.framework" ]
all_dependent_configs = [ "//third_party/protobuf:protobuf_config" ] all_dependent_configs = [ "//third_party/protobuf:protobuf_config" ]
} }
......
...@@ -18,7 +18,7 @@ source_set("device_check_eg2_tests") { ...@@ -18,7 +18,7 @@ source_set("device_check_eg2_tests") {
"//ios/third_party/earl_grey2:test_lib", "//ios/third_party/earl_grey2:test_lib",
"//url", "//url",
] ]
libs = [ "UIKit.framework" ] frameworks = [ "UIKit.framework" ]
} }
source_set("hooks") { source_set("hooks") {
...@@ -169,7 +169,7 @@ source_set("eg_app_support+eg2") { ...@@ -169,7 +169,7 @@ source_set("eg_app_support+eg2") {
"//ui/base", "//ui/base",
"//ui/base:test_support", "//ui/base:test_support",
] ]
libs = [ "IOKit.framework" ] frameworks = [ "IOKit.framework" ]
all_dependent_configs = [ "//third_party/protobuf:protobuf_config" ] all_dependent_configs = [ "//third_party/protobuf:protobuf_config" ]
} }
......
...@@ -204,5 +204,5 @@ source_set("eg2_tests") { ...@@ -204,5 +204,5 @@ source_set("eg2_tests") {
"//ui/base", "//ui/base",
] ]
libs = [ "UIKit.framework" ] frameworks = [ "UIKit.framework" ]
} }
...@@ -47,5 +47,5 @@ source_set("fakes") { ...@@ -47,5 +47,5 @@ source_set("fakes") {
"//ios/web/public/download", "//ios/web/public/download",
] ]
libs = [ "Foundation.framework" ] frameworks = [ "Foundation.framework" ]
} }
...@@ -78,5 +78,5 @@ source_set("cwt_chromedriver_tests") { ...@@ -78,5 +78,5 @@ source_set("cwt_chromedriver_tests") {
"//net:test_support", "//net:test_support",
] ]
libs = [ "UIKit.framework" ] frameworks = [ "UIKit.framework" ]
} }
...@@ -8,5 +8,5 @@ executable("generate_localizable_strings") { ...@@ -8,5 +8,5 @@ executable("generate_localizable_strings") {
"//base", "//base",
"//ui/base:ui_data_pack", "//ui/base:ui_data_pack",
] ]
libs = [ "Foundation.framework" ] frameworks = [ "Foundation.framework" ]
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment