summaryrefslogtreecommitdiffstats
path: root/components/sessions
diff options
context:
space:
mode:
authorrohitrao <rohitrao@chromium.org>2014-10-24 08:34:35 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-24 15:35:06 +0000
commitd16f44e6bb404dcb5b841f231b74da5afd6c5789 (patch)
tree666428352558fd3cadec2f227984164fd57140cc /components/sessions
parent373e3a9b371e91f347888eb8af77ab912ab37936 (diff)
downloadchromium_src-d16f44e6bb404dcb5b841f231b74da5afd6c5789.zip
chromium_src-d16f44e6bb404dcb5b841f231b74da5afd6c5789.tar.gz
chromium_src-d16f44e6bb404dcb5b841f231b74da5afd6c5789.tar.bz2
Renames the main components/sessions target to sessions_content.
This makes it clear that this target depends on //content and lays the groundwork for a future sessions_ios target. The files in components/sessions/core/ are moved to a variable so that they can be shared across targets. TBR=finnur@chromium.org TBR=sky@chromium.org BUG=371476 TEST=None Review URL: https://codereview.chromium.org/673843002 Cr-Commit-Position: refs/heads/master@{#301103}
Diffstat (limited to 'components/sessions')
-rw-r--r--components/sessions/BUILD.gn34
1 files changed, 25 insertions, 9 deletions
diff --git a/components/sessions/BUILD.gn b/components/sessions/BUILD.gn
index f2ada05..1b75012 100644
--- a/components/sessions/BUILD.gn
+++ b/components/sessions/BUILD.gn
@@ -6,14 +6,12 @@ if (is_android) {
import("//build/config/android/config.gni")
}
-component("sessions") {
+# TODO(rohitrao): sessions_core is defined as a source_set because it declares a
+# static function that it does not define. This prevents it from linking as a
+# shared_library. It also cannot be a static_library because it will be linked
+# into multiple shared libraries. Revisit this setup if necessary.
+source_set("sessions_core") {
sources = [
- # TODO(rohitrao): Split this target into three separate core, content,
- # and web targets.
- "content/content_serialized_navigation_builder.cc",
- "content/content_serialized_navigation_builder.h",
- "content/content_serialized_navigation_driver.cc",
- "content/content_serialized_navigation_driver.h",
"core/serialized_navigation_driver.h",
"serialized_navigation_entry.cc",
"serialized_navigation_entry.h",
@@ -25,8 +23,6 @@ component("sessions") {
deps = [
"//base",
- "//base/third_party/dynamic_annotations",
- "//content/public/browser",
"//skia",
"//ui/base",
"//url",
@@ -37,6 +33,26 @@ component("sessions") {
}
}
+component("sessions_content") {
+ sources = [
+ "content/content_serialized_navigation_builder.cc",
+ "content/content_serialized_navigation_builder.h",
+ "content/content_serialized_navigation_driver.cc",
+ "content/content_serialized_navigation_driver.h",
+ ]
+
+ defines = [ "SESSIONS_IMPLEMENTATION" ]
+
+ deps = [
+ ":sessions_core",
+ "//base",
+ "//base/third_party/dynamic_annotations",
+ "//content/public/browser",
+ "//ui/base",
+ "//url",
+ ]
+}
+
static_library("test_support") {
testonly = true
sources = [