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

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

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: I4e61fe7c448d138c6a3592f8e04442e73e4ad6eb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2276416
Auto-Submit: Sylvain Defresne <sdefresne@chromium.org>
Commit-Queue: edchin <edchin@chromium.org>
Reviewed-by: default avataredchin <edchin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#784397}
parent d2317876
...@@ -13,6 +13,6 @@ source_set("alert") { ...@@ -13,6 +13,6 @@ source_set("alert") {
"//ios/chrome/browser/ui/presenters", "//ios/chrome/browser/ui/presenters",
"//ios/showcase/common", "//ios/showcase/common",
] ]
libs = [ "UIKit.framework" ] frameworks = [ "UIKit.framework" ]
configs += [ "//build/config/compiler:enable_arc" ] configs += [ "//build/config/compiler:enable_arc" ]
} }
...@@ -17,7 +17,7 @@ source_set("badges") { ...@@ -17,7 +17,7 @@ source_set("badges") {
"//ios/chrome/common/ui/util", "//ios/chrome/common/ui/util",
"//ios/showcase/common", "//ios/showcase/common",
] ]
libs = [ "UIKit.framework" ] frameworks = [ "UIKit.framework" ]
configs += [ "//build/config/compiler:enable_arc" ] configs += [ "//build/config/compiler:enable_arc" ]
} }
...@@ -45,5 +45,5 @@ source_set("eg2_tests") { ...@@ -45,5 +45,5 @@ source_set("eg2_tests") {
"//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 = [ "UIKit.framework" ] frameworks = [ "UIKit.framework" ]
} }
...@@ -11,7 +11,7 @@ source_set("bubble") { ...@@ -11,7 +11,7 @@ source_set("bubble") {
"//ios/chrome/browser/ui/bubble", "//ios/chrome/browser/ui/bubble",
"//ios/showcase/common", "//ios/showcase/common",
] ]
libs = [ "UIKit.framework" ] frameworks = [ "UIKit.framework" ]
configs += [ "//build/config/compiler:enable_arc" ] configs += [ "//build/config/compiler:enable_arc" ]
} }
...@@ -28,5 +28,5 @@ source_set("eg2_tests") { ...@@ -28,5 +28,5 @@ source_set("eg2_tests") {
"//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 = [ "UIKit.framework" ] frameworks = [ "UIKit.framework" ]
} }
...@@ -10,6 +10,6 @@ source_set("common") { ...@@ -10,6 +10,6 @@ source_set("common") {
"protocol_alerter.mm", "protocol_alerter.mm",
] ]
deps = [ "//base" ] deps = [ "//base" ]
libs = [ "UIKit.framework" ] frameworks = [ "UIKit.framework" ]
configs += [ "//build/config/compiler:enable_arc" ] configs += [ "//build/config/compiler:enable_arc" ]
} }
...@@ -26,7 +26,7 @@ source_set("content_suggestions") { ...@@ -26,7 +26,7 @@ source_set("content_suggestions") {
"//ios/showcase/common", "//ios/showcase/common",
"//ui/base", "//ui/base",
] ]
libs = [ "UIKit.framework" ] frameworks = [ "UIKit.framework" ]
configs += [ "//build/config/compiler:enable_arc" ] configs += [ "//build/config/compiler:enable_arc" ]
} }
...@@ -48,5 +48,5 @@ source_set("eg2_tests") { ...@@ -48,5 +48,5 @@ source_set("eg2_tests") {
"//ios/third_party/earl_grey2:test_lib", "//ios/third_party/earl_grey2:test_lib",
"//ui/base", "//ui/base",
] ]
libs = [ "UIKit.framework" ] frameworks = [ "UIKit.framework" ]
} }
...@@ -20,7 +20,7 @@ source_set("core") { ...@@ -20,7 +20,7 @@ source_set("core") {
"//ios/third_party/material_components_ios:material_components_ios+link", "//ios/third_party/material_components_ios:material_components_ios+link",
"//ui/base", "//ui/base",
] ]
libs = [ "UIKit.framework" ] frameworks = [ "UIKit.framework" ]
configs += [ "//build/config/compiler:enable_arc" ] configs += [ "//build/config/compiler:enable_arc" ]
} }
...@@ -39,7 +39,7 @@ source_set("main_eg2") { ...@@ -39,7 +39,7 @@ source_set("main_eg2") {
# Needed for including ios/chrome/browser/ui. # Needed for including ios/chrome/browser/ui.
"//ios/chrome/browser/tabs:tabs_internal", "//ios/chrome/browser/tabs:tabs_internal",
] ]
libs = [ "UIKit.framework" ] frameworks = [ "UIKit.framework" ]
configs += [ "//build/config/compiler:enable_arc" ] configs += [ "//build/config/compiler:enable_arc" ]
} }
...@@ -57,7 +57,7 @@ source_set("main") { ...@@ -57,7 +57,7 @@ source_set("main") {
# Needed for including ios/chrome/browser/ui. # Needed for including ios/chrome/browser/ui.
"//ios/chrome/browser/tabs:tabs_internal", "//ios/chrome/browser/tabs:tabs_internal",
] ]
libs = [ "UIKit.framework" ] frameworks = [ "UIKit.framework" ]
configs += [ "//build/config/compiler:enable_arc" ] configs += [ "//build/config/compiler:enable_arc" ]
} }
...@@ -74,5 +74,5 @@ source_set("eg2_tests") { ...@@ -74,5 +74,5 @@ source_set("eg2_tests") {
"//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 = [ "UIKit.framework" ] frameworks = [ "UIKit.framework" ]
} }
...@@ -12,7 +12,7 @@ source_set("credential_provider") { ...@@ -12,7 +12,7 @@ source_set("credential_provider") {
"//ios/chrome/credential_provider_extension/ui", "//ios/chrome/credential_provider_extension/ui",
"//ios/showcase/common", "//ios/showcase/common",
] ]
libs = [ "UIKit.framework" ] frameworks = [ "UIKit.framework" ]
configs += [ "//build/config/compiler:enable_arc" ] configs += [ "//build/config/compiler:enable_arc" ]
} }
...@@ -32,5 +32,5 @@ source_set("eg2_tests") { ...@@ -32,5 +32,5 @@ source_set("eg2_tests") {
"//ios/third_party/earl_grey2:test_lib", "//ios/third_party/earl_grey2:test_lib",
"//ui/base", "//ui/base",
] ]
libs = [ "UIKit.framework" ] frameworks = [ "UIKit.framework" ]
} }
...@@ -25,7 +25,7 @@ source_set("infobars") { ...@@ -25,7 +25,7 @@ source_set("infobars") {
"//ios/showcase/common", "//ios/showcase/common",
"//url", "//url",
] ]
libs = [ "UIKit.framework" ] frameworks = [ "UIKit.framework" ]
configs += [ "//build/config/compiler:enable_arc" ] configs += [ "//build/config/compiler:enable_arc" ]
} }
...@@ -57,5 +57,5 @@ source_set("eg2_tests") { ...@@ -57,5 +57,5 @@ source_set("eg2_tests") {
"//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 = [ "UIKit.framework" ] frameworks = [ "UIKit.framework" ]
} }
...@@ -22,6 +22,6 @@ source_set("omnibox_popup") { ...@@ -22,6 +22,6 @@ source_set("omnibox_popup") {
"//ios/showcase/common", "//ios/showcase/common",
"//url", "//url",
] ]
libs = [ "UIKit.framework" ] frameworks = [ "UIKit.framework" ]
configs += [ "//build/config/compiler:enable_arc" ] configs += [ "//build/config/compiler:enable_arc" ]
} }
...@@ -12,6 +12,6 @@ source_set("recent_tabs") { ...@@ -12,6 +12,6 @@ source_set("recent_tabs") {
"//ios/chrome/browser/ui/recent_tabs:recent_tabs_ui", "//ios/chrome/browser/ui/recent_tabs:recent_tabs_ui",
"//ios/showcase/common", "//ios/showcase/common",
] ]
libs = [ "UIKit.framework" ] frameworks = [ "UIKit.framework" ]
configs += [ "//build/config/compiler:enable_arc" ] configs += [ "//build/config/compiler:enable_arc" ]
} }
...@@ -11,6 +11,6 @@ source_set("settings") { ...@@ -11,6 +11,6 @@ source_set("settings") {
"//base", "//base",
"//ios/showcase/common", "//ios/showcase/common",
] ]
libs = [ "UIKit.framework" ] frameworks = [ "UIKit.framework" ]
configs += [ "//build/config/compiler:enable_arc" ] configs += [ "//build/config/compiler:enable_arc" ]
} }
...@@ -22,6 +22,6 @@ source_set("tab_grid") { ...@@ -22,6 +22,6 @@ source_set("tab_grid") {
"//ios/chrome/browser/ui/tab_grid/grid:grid_ui", "//ios/chrome/browser/ui/tab_grid/grid:grid_ui",
"//ios/showcase/common", "//ios/showcase/common",
] ]
libs = [ "UIKit.framework" ] frameworks = [ "UIKit.framework" ]
configs += [ "//build/config/compiler:enable_arc" ] configs += [ "//build/config/compiler:enable_arc" ]
} }
...@@ -4,7 +4,7 @@ source_set("text_badge_view") { ...@@ -4,7 +4,7 @@ source_set("text_badge_view") {
"sc_text_badge_view_controller.mm", "sc_text_badge_view_controller.mm",
] ]
deps = [ "//ios/chrome/browser/ui/reading_list:reading_list_ui" ] deps = [ "//ios/chrome/browser/ui/reading_list:reading_list_ui" ]
libs = [ "UIKit.framework" ] frameworks = [ "UIKit.framework" ]
configs += [ "//build/config/compiler:enable_arc" ] configs += [ "//build/config/compiler:enable_arc" ]
} }
...@@ -21,5 +21,5 @@ source_set("eg2_tests") { ...@@ -21,5 +21,5 @@ source_set("eg2_tests") {
"//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 = [ "UIKit.framework" ] frameworks = [ "UIKit.framework" ]
} }
...@@ -7,6 +7,6 @@ source_set("uikit_table_view_cell") { ...@@ -7,6 +7,6 @@ source_set("uikit_table_view_cell") {
"uikit_table_view_cell_view_controller.h", "uikit_table_view_cell_view_controller.h",
"uikit_table_view_cell_view_controller.mm", "uikit_table_view_cell_view_controller.mm",
] ]
libs = [ "UIKit.framework" ] frameworks = [ "UIKit.framework" ]
configs += [ "//build/config/compiler:enable_arc" ] configs += [ "//build/config/compiler:enable_arc" ]
} }
...@@ -14,6 +14,6 @@ source_set("widget") { ...@@ -14,6 +14,6 @@ source_set("widget") {
"//ios/chrome/search_widget_extension:search_widget", "//ios/chrome/search_widget_extension:search_widget",
"//ios/showcase/common", "//ios/showcase/common",
] ]
libs = [ "UIKit.framework" ] frameworks = [ "UIKit.framework" ]
configs += [ "//build/config/compiler:enable_arc" ] configs += [ "//build/config/compiler:enable_arc" ]
} }
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