Commit 8ee67a6f authored by Javier Ernesto Flores Robles's avatar Javier Ernesto Flores Robles Committed by Commit Bot

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

This reverts commit 1f71ed14.

Reason for revert: breaks compilation of ios_remoting_unittests

Original change's description:
> [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/+/2020960
> Reviewed-by: Yuwei Huang <yuweih@chromium.org>
> Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#735790}

TBR=sdefresne@chromium.org,yuweih@chromium.org

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