Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1713)

Unified Diff: chrome/common/BUILD.gn

Issue 2282573002: Remove is_ios conditions from chrome GN build files. (Closed)
Patch Set: merge Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/BUILD.gn ('k') | chrome/renderer/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/BUILD.gn
diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
index bbed8ceae64d6ce3e113033c701a44881bd636bb..0bf66429999ae6ee343a2ef7bf3c24e479983ddd 100644
--- a/chrome/common/BUILD.gn
+++ b/chrome/common/BUILD.gn
@@ -53,6 +53,7 @@ static_library("common") {
public_deps = [
":features",
+ ":mojo_bindings",
"//base:base",
"//base:base_static",
"//base:i18n",
@@ -60,9 +61,12 @@ static_library("common") {
"//chrome:strings",
"//chrome/app/theme:theme_resources",
"//chrome/common:constants",
+ "//chrome/common/net",
"//chrome/common/safe_browsing:proto",
"//chrome/common/variations:fieldtrial_testing_config",
"//chrome/installer/util:with_no_strings",
+ "//components/autofill/content/common",
+ "//components/autofill/core/common",
"//components/cast_certificate",
"//components/cdm/common",
"//components/cloud_devices/common",
@@ -82,14 +86,19 @@ static_library("common") {
"//components/nacl/common:switches",
"//components/offline_pages:switches",
"//components/omnibox/common",
+ "//components/password_manager/content/public/interfaces",
+ "//components/password_manager/core/common",
"//components/policy:generated",
"//components/policy/core/common",
"//components/prefs",
+ "//components/signin/core/common",
"//components/strings",
+ "//components/translate/content/common",
"//components/translate/core/common",
"//components/url_formatter",
"//components/variations",
"//components/version_info",
+ "//components/visitedlink/common",
"//content/public/common",
"//crypto",
"//extensions/common:common_constants",
@@ -97,10 +106,15 @@ static_library("common") {
"//google_apis",
"//gpu/command_buffer/service",
"//gpu/config",
+ "//ipc",
+ "//media",
+ "//mojo/public/cpp/bindings",
"//net",
"//skia",
"//third_party/icu",
"//third_party/kasko:kasko_features",
+ "//third_party/re2",
+ "//third_party/widevine/cdm:version_h",
"//third_party/zlib:zip",
"//ui/accessibility",
"//ui/base",
@@ -117,35 +131,6 @@ static_library("common") {
public_deps += [ "//ppapi/shared_impl" ]
}
- if (is_ios) {
- sources += [
- # Use this Mac file that was filtered out.
- "channel_info_mac.mm",
- ]
- sources -= [
- "resource_usage_reporter_type_converters.cc",
- "resource_usage_reporter_type_converters.h",
- ]
- } else {
- # Non-iOS.
- public_deps += [
- ":mojo_bindings",
- "//chrome/common/net",
- "//components/autofill/content/common",
- "//components/autofill/core/common",
- "//components/password_manager/content/public/interfaces",
- "//components/password_manager/core/common",
- "//components/signin/core/common",
- "//components/translate/content/common",
- "//components/visitedlink/common",
- "//ipc",
- "//media",
- "//mojo/public/cpp/bindings",
- "//third_party/re2",
- "//third_party/widevine/cdm:version_h",
- ]
- }
-
if (enable_extensions) {
sources += rebase_path(gypi_values.chrome_common_extensions_sources,
".",
« no previous file with comments | « chrome/browser/ui/BUILD.gn ('k') | chrome/renderer/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698