Commit 1f71ed14 authored by Sylvain Defresne's avatar Sylvain Defresne Committed by Commit Bot

[ios][remoting] Improve linking with MaterialComponents.framework

Change remoting code to only link with MaterialComponents.framework if
the code is compiled as a framework (this will allow removing the fake
targets that exists in ios/third_party/material_components_ios/BUILD.gn).

If using MaterialComponents.framework, then bundle it with the app.

Bug: 1040871
Change-Id: I05af4bc9a0f80a83f42a2113e01f4c5f0dc09eec
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2020960Reviewed-by: default avatarYuwei Huang <yuweih@chromium.org>
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#735790}
parent 4a7c42ec
......@@ -2,6 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//ios/third_party/features.gni")
import("//remoting/build/config/remoting_build.gni")
import("//remoting/ios/app/remoting_ios_tmpl.gni")
......@@ -111,7 +112,7 @@ source_set("common_source_set") {
}
public_deps = [
"//ios/third_party/material_components_ios:material_components_ios+link",
"//ios/third_party/material_components_ios",
"//remoting/ios/facade",
]
......@@ -144,8 +145,14 @@ ios_remoting_app_tmpl("ios_remoting_app") {
entitlements_path = "resources/Remoting.entitlements"
deps = [
":app_source_set",
"//ios/third_party/material_components_ios:material_components_ios+bundle",
"//remoting/ios/app/resources:launchscreen_assets",
"//remoting/ios/app/resources:remoting_icons",
]
if (ios_third_party_material_components_built_as_framework) {
deps += [
"//ios/third_party/material_components_ios:material_components_ios+bundle",
"//ios/third_party/material_components_ios:material_components_ios+link",
]
}
}
......@@ -27,9 +27,7 @@ source_set("settings") {
"//ui/resources",
]
public_deps = [
"//ios/third_party/material_components_ios:material_components_ios+link",
]
public_deps = [ "//ios/third_party/material_components_ios" ]
configs += [ "//build/config/compiler:enable_arc" ]
}
......@@ -25,7 +25,7 @@ source_set("facade") {
deps = [
"//base",
"//ios/third_party/material_components_ios:material_components_ios+link",
"//ios/third_party/material_components_ios",
"//remoting/base:authorization",
"//remoting/client",
"//remoting/ios/domain",
......
......@@ -14,9 +14,7 @@ source_set("mdc") {
libs = [ "UIKit.framework" ]
deps = [
"//ios/third_party/material_components_ios:material_components_ios+link",
]
deps = [ "//ios/third_party/material_components_ios" ]
configs += [ "//build/config/compiler:enable_arc" ]
}
......@@ -16,7 +16,7 @@ source_set("session") {
deps = [
"//base",
"//ios/third_party/material_components_ios:material_components_ios+link",
"//ios/third_party/material_components_ios",
"//remoting/client",
"//remoting/client/display",
"//remoting/client/ui",
......
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