Commit d33615ea authored by Christopher Grant's avatar Christopher Grant Committed by Commit Bot

Move chrome features to a component

By moving the feature source into a component, we won't end up with
multiple instances of the feature constants across multiple component
build libraries.  This should eliminate DCHECK failures that crop up
when components check if features are enabled.

BUG=872073

Change-Id: Ia82e990596d52076027499fe23b73c870c64b5e1
Reviewed-on: https://chromium-review.googlesource.com/1177895
Commit-Queue: Christopher Grant <cjgrant@chromium.org>
Reviewed-by: default avatarAvi Drissman <avi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#584834}
parent e94813f4
......@@ -549,10 +549,34 @@ static_library("non_code_constants") {
]
}
static_library("constants") {
component("chrome_features") {
defines = [ "IS_CHROME_FEATURES_IMPL" ]
sources = [
"chrome_features.cc",
"chrome_features.h",
]
deps = [
":buildflags",
":non_code_constants",
"//base",
"//components/offline_pages/buildflags",
"//device/vr/buildflags",
"//extensions/buildflags",
"//media:media_buildflags",
"//ppapi/buildflags",
"//printing/buildflags",
"//rlz/buildflags",
]
public_deps = [
"//ui/base:ui_features",
]
}
static_library("constants") {
sources = [
"chrome_paths.cc",
"chrome_paths.h",
"chrome_paths_android.cc",
......@@ -569,13 +593,12 @@ static_library("constants") {
public_deps = [
":buildflags",
":chrome_features",
":non_code_constants",
"//content/public/common:result_codes",
"//extensions/buildflags",
"//printing/buildflags",
"//rlz/buildflags",
"//ui/base:ui_features",
]
deps = [
":channel_info",
":version_header",
......@@ -584,10 +607,10 @@ static_library("constants") {
"//components/bookmarks/common",
"//components/nacl/common:switches",
"//components/offline_pages/buildflags",
"//device/vr/buildflags",
"//media:media_buildflags",
"//extensions/buildflags",
"//media/cdm:cdm_paths", # Needed by chrome_paths.cc.
"//ppapi/buildflags",
"//printing/buildflags",
"//third_party/widevine/cdm:headers",
]
......
This diff is collapsed.
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