Commit 27c72c0d authored by Brian Geffon's avatar Brian Geffon Committed by Commit Bot

CrOS: Migrate ChromeOS memory/ folder to a new component.

The folder //chromeos/memory is growing larger and will
continue to do so. To help keep //chromeos clean we will
move it to a standalone component.

Bug: 1067833
Change-Id: I7931b4a649038212aa7b87d44479958f644ff668
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2149947
Commit-Queue: Steven Bennetts <stevenjb@chromium.org>
Reviewed-by: default avatarSteven Bennetts <stevenjb@chromium.org>
Reviewed-by: default avatarYaron Friedman <yfriedman@chromium.org>
Reviewed-by: default avatarDirk Pranke <dpranke@chromium.org>
Auto-Submit: Brian Geffon <bgeffon@chromium.org>
Cr-Commit-Position: refs/heads/master@{#759293}
parent 6e0ec56a
...@@ -165,6 +165,7 @@ static_library("test_support") { ...@@ -165,6 +165,7 @@ static_library("test_support") {
deps += [ deps += [
"//chrome/browser/chromeos", "//chrome/browser/chromeos",
"//chromeos", "//chromeos",
"//chromeos/memory:memory",
] ]
} }
......
...@@ -42,31 +42,16 @@ component("chromeos") { ...@@ -42,31 +42,16 @@ component("chromeos") {
":chromeos_export", ":chromeos_export",
"//base", "//base",
"//base:i18n", "//base:i18n",
"//base/util/memory_pressure",
"//chromeos/dbus", "//chromeos/dbus",
"//chromeos/dbus/constants", "//chromeos/dbus/constants",
"//components/policy/proto", "//components/policy/proto",
"//crypto",
"//crypto:platform",
"//google_apis", "//google_apis",
"//services/network/public/cpp:cpp", "//services/network/public/cpp:cpp",
"//third_party/protobuf:protobuf_lite", "//third_party/protobuf:protobuf_lite",
"//third_party/zlib/google:compression_utils",
] ]
sources = [ sources = [
"hugepage_text/hugepage_text.cc", "hugepage_text/hugepage_text.cc",
"hugepage_text/hugepage_text.h", "hugepage_text/hugepage_text.h",
"memory/kstaled.cc",
"memory/kstaled.h",
"memory/memory.cc",
"memory/memory.h",
"memory/pagemap.cc",
"memory/pagemap.h",
"memory/swap_configuration.cc",
"memory/swap_configuration.h",
"memory/userspace_swap/region.h",
"memory/userspace_swap/swap_storage.cc",
"memory/userspace_swap/swap_storage.h",
"policy/weekly_time/time_utils.cc", "policy/weekly_time/time_utils.cc",
"policy/weekly_time/time_utils.h", "policy/weekly_time/time_utils.h",
"policy/weekly_time/weekly_time.cc", "policy/weekly_time/weekly_time.cc",
...@@ -178,6 +163,7 @@ test("chromeos_unittests") { ...@@ -178,6 +163,7 @@ test("chromeos_unittests") {
"//chromeos/login/auth:unit_tests", "//chromeos/login/auth:unit_tests",
"//chromeos/login/login_state:unit_tests", "//chromeos/login/login_state:unit_tests",
"//chromeos/login/session:unit_tests", "//chromeos/login/session:unit_tests",
"//chromeos/memory:unit_tests",
"//chromeos/network:test_support", "//chromeos/network:test_support",
"//chromeos/network:unit_tests", "//chromeos/network:unit_tests",
"//chromeos/services:unit_tests", "//chromeos/services:unit_tests",
...@@ -205,8 +191,6 @@ test("chromeos_unittests") { ...@@ -205,8 +191,6 @@ test("chromeos_unittests") {
"//url", "//url",
] ]
sources = [ sources = [
"memory/pagemap_unittest.cc",
"memory/userspace_swap/swap_storage_unittest.cc",
"policy/weekly_time/time_utils_unittest.cc", "policy/weekly_time/time_utils_unittest.cc",
"policy/weekly_time/weekly_time_interval_unittest.cc", "policy/weekly_time/weekly_time_interval_unittest.cc",
"policy/weekly_time/weekly_time_unittest.cc", "policy/weekly_time/weekly_time_unittest.cc",
......
# Copyright 2020 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.
import("//build/buildflag_header.gni")
import("//testing/test.gni")
assert(is_chromeos, "Non-Chrome-OS builds must not depend on //chromeos")
# Used by targets that compile into the implementation.
config("chromeos_implementation") {
defines = [ "CHROMEOS_IMPLEMENTATION" ]
}
component("memory") {
configs += [
":chromeos_implementation",
"//build/config/linux/nss:system_nss_no_ssl_config",
]
public_deps = [ "//chromeos/constants" ]
deps = [
"//base",
"//base/util/memory_pressure",
"//chromeos:chromeos_export",
"//chromeos/dbus",
"//chromeos/dbus/constants",
"//crypto",
"//crypto:platform",
"//third_party/zlib/google:compression_utils",
]
sources = [
"kstaled.cc",
"kstaled.h",
"memory.cc",
"memory.h",
"pagemap.cc",
"pagemap.h",
"swap_configuration.cc",
"swap_configuration.h",
"userspace_swap/region.h",
"userspace_swap/swap_storage.cc",
"userspace_swap/swap_storage.h",
]
}
source_set("unit_tests") {
testonly = true
configs += [ "//build/config/linux/nss:system_nss_no_ssl_config" ]
deps = [
":memory",
"//base/test:test_support",
"//chromeos:chromeos_buildflags",
"//mojo/core/embedder",
"//testing/gmock",
"//testing/gtest",
]
sources = [
"pagemap_unittest.cc",
"userspace_swap/swap_storage_unittest.cc",
]
}
...@@ -231,7 +231,6 @@ static_library("arc_base") { ...@@ -231,7 +231,6 @@ static_library("arc_base") {
deps = [ deps = [
"//ash/public/cpp", "//ash/public/cpp",
"//base", "//base",
"//chromeos",
"//chromeos/constants", "//chromeos/constants",
"//chromeos/cryptohome", "//chromeos/cryptohome",
"//chromeos/dbus:common", "//chromeos/dbus:common",
...@@ -240,6 +239,7 @@ static_library("arc_base") { ...@@ -240,6 +239,7 @@ static_library("arc_base") {
"//chromeos/dbus/session_manager", "//chromeos/dbus/session_manager",
"//chromeos/dbus/session_manager:login_manager_proto", "//chromeos/dbus/session_manager:login_manager_proto",
"//chromeos/dbus/upstart", "//chromeos/dbus/upstart",
"//chromeos/memory:memory",
"//chromeos/system:system", "//chromeos/system:system",
"//components/account_id", "//components/account_id",
"//components/keyed_service/content", "//components/keyed_service/content",
......
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