Skip to content

GitLab

T
tangled
Commit 7e894e13 authored by Eugene But's avatar Eugene But Committed by Commit Bot
Browse files
Options

Remove ios_third_party_material_components_built_as_framework gn flag 

False is no longer supported configuration.

Bug: 1017165

Change-Id: I67ec5b56afc2b2363c6013106bf4f4f0123e2114
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2228052Reviewed-by: default avatarSylvain Defresne <sdefresne@chromium.org>
Reviewed-by: default avatarYuwei Huang <yuweih@chromium.org>
Auto-Submit: Eugene But <eugenebut@chromium.org>
Commit-Queue: Eugene But <eugenebut@chromium.org>
Cr-Commit-Position: refs/heads/master@{#775224}
parent 5e94707c
Hide whitespace changes
Inline Side-by-side
Showing with 878 additions and 973 deletions
ios/chrome/app/BUILD.gn
View file @ 7e894e13
......@@ -10,7 +10,6 @@ import("//ios/build/chrome_build.gni")
import("//ios/build/config.gni")
import("//ios/chrome/features.gni")
import("//ios/public/provider/chrome/browser/build_config.gni")
import("//ios/third_party/features.gni")
source_set("app") {
configs += [ "//build/config/compiler:enable_arc" ]
......@@ -298,18 +297,16 @@ source_set("main") {
"//ios/testing/perf:startup",
]
if (ios_third_party_material_components_built_as_framework) {
if (ios_chrome_links_with_material_components_framework) {
deps += [
"//ios/third_party/material_components_ios:material_components_ios+bundle",
"//ios/third_party/material_components_ios:material_components_ios+link",
]
} else {
assert_no_deps = [
"//ios/third_party/material_components_ios:material_components_ios+bundle",
"//ios/third_party/material_components_ios:material_components_ios+link",
]
}
if (ios_chrome_links_with_material_components_framework) {
deps += [
"//ios/third_party/material_components_ios:material_components_ios+bundle",
"//ios/third_party/material_components_ios:material_components_ios+link",
]
} else {
assert_no_deps = [
"//ios/third_party/material_components_ios:material_components_ios+bundle",
"//ios/third_party/material_components_ios:material_components_ios+link",
]
}
}
......@@ -369,18 +366,16 @@ ios_app_bundle("chrome") {
assert_no_deps = ios_assert_no_deps + ios_chrome_extra_assert_no_deps
if (ios_third_party_material_components_built_as_framework) {
if (ios_chrome_links_with_material_components_framework) {
deps += [
"//ios/third_party/material_components_ios:material_components_ios+bundle",
"//ios/third_party/material_components_ios:material_components_ios+link",
]
} else {
assert_no_deps += [
"//ios/third_party/material_components_ios:material_components_ios+bundle",
"//ios/third_party/material_components_ios:material_components_ios+link",
]
}
if (ios_chrome_links_with_material_components_framework) {
deps += [
"//ios/third_party/material_components_ios:material_components_ios+bundle",
"//ios/third_party/material_components_ios:material_components_ios+link",
]
} else {
assert_no_deps += [
"//ios/third_party/material_components_ios:material_components_ios+bundle",
"//ios/third_party/material_components_ios:material_components_ios+link",
]
}
}
......
ios/chrome/test/BUILD.gn
View file @ 7e894e13
......@@ -6,7 +6,6 @@ import("//ios/build/chrome_build.gni")
import("//ios/build/config.gni")
import("//ios/chrome/features.gni")
import("//ios/public/provider/chrome/browser/build_config.gni")
import("//ios/third_party/features.gni")
import("//testing/test.gni")
import("//third_party/protobuf/proto_library.gni")
......@@ -131,18 +130,16 @@ source_set("run_all_unittests") {
"//mojo/core/embedder",
]
if (ios_third_party_material_components_built_as_framework) {
if (ios_chrome_links_with_material_components_framework) {
public_deps = [
"//ios/third_party/material_components_ios:material_components_ios+bundle",
"//ios/third_party/material_components_ios:material_components_ios+link",
]
} else {
assert_no_deps = [
"//ios/third_party/material_components_ios:material_components_ios+bundle",
"//ios/third_party/material_components_ios:material_components_ios+link",
]
}
if (ios_chrome_links_with_material_components_framework) {
public_deps = [
"//ios/third_party/material_components_ios:material_components_ios+bundle",
"//ios/third_party/material_components_ios:material_components_ios+link",
]
} else {
assert_no_deps = [
"//ios/third_party/material_components_ios:material_components_ios+bundle",
"//ios/third_party/material_components_ios:material_components_ios+link",
]
}
}
......
ios/third_party/features.gni deleted 100644 → 0
View file @ 5e94707c
# Copyright 2019 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
declare_args() {
# Controls whether //ios/third_party/material_components_ios (and its
# dependencies) is build as a framework bundle. This boolean allows
# migrating the internal code to the framework incrementally.
ios_third_party_material_components_built_as_framework = true
}
ios/third_party/material_components_ios/BUILD.gn
View file @ 7e894e13
This source diff could not be displayed because it is too large. You can view the blob instead.
ios/web_view/shell/BUILD.gn
View file @ 7e894e13
......@@ -3,7 +3,6 @@
# found in the LICENSE file.
import("//build/config/ios/rules.gni")
import("//ios/third_party/features.gni")
declare_args() {
# Authorization service implementation used in ios_web_view_shell. Uses a fake
......@@ -40,18 +39,16 @@ ios_app_bundle("ios_web_view_shell") {
]
entitlements_path = ios_web_view_shell_entitlements_path
if (ios_third_party_material_components_built_as_framework) {
if (ios_web_view_shell_links_with_material_components_framework) {
deps += [
"//ios/third_party/material_components_ios:material_components_ios+bundle",
"//ios/third_party/material_components_ios:material_components_ios+link",
]
} else {
assert_no_deps = [
"//ios/third_party/material_components_ios:material_components_ios+bundle",
"//ios/third_party/material_components_ios:material_components_ios+link",
]
}
if (ios_web_view_shell_links_with_material_components_framework) {
deps += [
"//ios/third_party/material_components_ios:material_components_ios+bundle",
"//ios/third_party/material_components_ios:material_components_ios+link",
]
} else {
assert_no_deps = [
"//ios/third_party/material_components_ios:material_components_ios+bundle",
"//ios/third_party/material_components_ios:material_components_ios+link",
]
}
configs += [ "//build/config/compiler:enable_arc" ]
......
ios/web_view/shell/test/BUILD.gn
View file @ 7e894e13
......@@ -4,7 +4,6 @@
import("//ios/build/config.gni")
import("//ios/third_party/earl_grey/ios_eg_test.gni")
import("//ios/third_party/features.gni")
group("all_tests") {
testonly = true
......@@ -19,19 +18,14 @@ ios_eg_test("ios_web_view_shell_egtests") {
deps = [
":earl_grey_test_support",
"//ios/testing:http_server_bundle_data",
"//ios/third_party/material_components_ios:material_components_ios+bundle",
"//ios/third_party/material_components_ios:material_components_ios+link",
"//ios/web_view:web_view+link",
"//ios/web_view/shell:shell",
"//ios/web_view/test:test_support",
"//net:test_support",
]
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",
]
}
configs += [ "//build/config/compiler:enable_arc" ]
assert_no_deps = ios_assert_no_deps
......
remoting/ios/BUILD.gn
View file @ 7e894e13
......@@ -2,7 +2,6 @@
# 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/remoting_locales.gni")
......@@ -76,6 +75,7 @@ test("ios_remoting_unittests") {
deps = [
"//base/test:run_all_unittests",
"//base/test:test_support",
"//ios/third_party/material_components_ios:material_components_ios+link",
"//remoting/ios/audio:unit_tests",
"//remoting/ios/facade:unit_tests",
"//remoting/ios/persistence:unit_tests",
......@@ -85,13 +85,9 @@ test("ios_remoting_unittests") {
deps += [ ":unittests_locale_${locale}_bundle_data" ]
}
if (ios_third_party_material_components_built_as_framework) {
deps += [
"//ios/third_party/material_components_ios:material_components_ios+link",
]
bundle_deps = [ "//ios/third_party/material_components_ios:material_components_ios+bundle" ]
}
bundle_deps = [
"//ios/third_party/material_components_ios:material_components_ios+bundle",
]
}
foreach(locale, remoting_locales_with_underscores) {
......
remoting/ios/app/BUILD.gn
View file @ 7e894e13
......@@ -2,7 +2,6 @@
# 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")
......@@ -145,14 +144,12 @@ 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+link",
"//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+link",
]
bundle_deps = [ "//ios/third_party/material_components_ios:material_components_ios+bundle" ]
}
bundle_deps = [
"//ios/third_party/material_components_ios:material_components_ios+bundle",
]
}
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