Skip to content

Rename config_instance_derived to cuttlefish_config_paths #2427

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Databean wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Rename config_instance_derived to cuttlefish_config_paths #2427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion base/cvd/cuttlefish/common/frontend/socket_vsock_proxy/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ cf_cc_binary(
"//cuttlefish/common/libs/utils:tee_logging",
"//cuttlefish/host/commands/kernel_log_monitor:kernel_log_monitor_utils",
"//cuttlefish/host/libs/command_util",
"//cuttlefish/host/libs/config:config_instance_derived",
"//cuttlefish/host/libs/config:cuttlefish_config",
"//cuttlefish/host/libs/config:cuttlefish_config_paths",
"//cuttlefish/host/libs/config:logging",
"//cuttlefish/result",
"//libbase",
Expand Down
2 changes: 1 addition & 1 deletion base/cvd/cuttlefish/common/frontend/socket_vsock_proxy/socket_vsock_proxy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
#include "cuttlefish/common/libs/fs/shared_fd.h"
#include "cuttlefish/common/libs/utils/socket2socket_proxy.h"
#include "cuttlefish/host/commands/kernel_log_monitor/utils.h"
#include "cuttlefish/host/libs/config/config_instance_derived.h"
#include "cuttlefish/host/libs/config/cuttlefish_config.h"
#include "cuttlefish/host/libs/config/cuttlefish_config_paths.h"
#include "cuttlefish/host/libs/config/logging.h"
#include "cuttlefish/result/result.h"

Expand Down
2 changes: 1 addition & 1 deletion base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,8 +211,8 @@ cf_cc_library(
"//cuttlefish/host/commands/assemble_cvd/flags:system_image_dir",
"//cuttlefish/host/libs/config:ap_boot_flow",
"//cuttlefish/host/libs/config:build_archive",
"//cuttlefish/host/libs/config:config_instance_derived",
"//cuttlefish/host/libs/config:cuttlefish_config",
"//cuttlefish/host/libs/config:cuttlefish_config_paths",
"//cuttlefish/host/libs/config:data_image",
"//cuttlefish/host/libs/config:fetcher_config",
"//cuttlefish/host/libs/config:fetcher_configs",
Expand Down
2 changes: 1 addition & 1 deletion base/cvd/cuttlefish/host/commands/assemble_cvd/create_dynamic_disk_files.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@
#include "cuttlefish/host/commands/assemble_cvd/super_image_mixer.h"
#include "cuttlefish/host/libs/config/ap_boot_flow.h"
#include "cuttlefish/host/libs/config/build_archive.h"
#include "cuttlefish/host/libs/config/config_instance_derived.h"
#include "cuttlefish/host/libs/config/cuttlefish_config.h"
#include "cuttlefish/host/libs/config/cuttlefish_config_paths.h"
#include "cuttlefish/host/libs/config/data_image.h"
#include "cuttlefish/host/libs/config/fetcher_config.h"
#include "cuttlefish/host/libs/config/fetcher_configs.h"
Expand Down
8 changes: 4 additions & 4 deletions base/cvd/cuttlefish/host/commands/assemble_cvd/disk/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ cf_cc_library(
hdrs = ["access_kregistry.h"],
deps = [
"//cuttlefish/common/libs/utils:files",
"//cuttlefish/host/libs/config:config_instance_derived",
"//cuttlefish/host/libs/config:cuttlefish_config",
"//cuttlefish/host/libs/config:cuttlefish_config_paths",
"//cuttlefish/host/libs/config:data_image",
"//cuttlefish/result",
],
Expand Down Expand Up @@ -188,8 +188,8 @@ cf_cc_library(
hdrs = ["hwcomposer_pmem.h"],
deps = [
"//cuttlefish/common/libs/utils:files",
"//cuttlefish/host/libs/config:config_instance_derived",
"//cuttlefish/host/libs/config:cuttlefish_config",
"//cuttlefish/host/libs/config:cuttlefish_config_paths",
"//cuttlefish/host/libs/config:data_image",
"//cuttlefish/result",
],
Expand Down Expand Up @@ -314,8 +314,8 @@ cf_cc_library(
hdrs = ["pflash.h"],
deps = [
"//cuttlefish/common/libs/utils:files",
"//cuttlefish/host/libs/config:config_instance_derived",
"//cuttlefish/host/libs/config:cuttlefish_config",
"//cuttlefish/host/libs/config:cuttlefish_config_paths",
"//cuttlefish/host/libs/config:data_image",
"//cuttlefish/result",
],
Expand All @@ -327,8 +327,8 @@ cf_cc_library(
hdrs = ["pstore.h"],
deps = [
"//cuttlefish/common/libs/utils:files",
"//cuttlefish/host/libs/config:config_instance_derived",
"//cuttlefish/host/libs/config:cuttlefish_config",
"//cuttlefish/host/libs/config:cuttlefish_config_paths",
"//cuttlefish/host/libs/config:data_image",
"//cuttlefish/result",
],
Expand Down
2 changes: 1 addition & 1 deletion base/cvd/cuttlefish/host/commands/assemble_cvd/disk/access_kregistry.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
#include "cuttlefish/host/commands/assemble_cvd/disk/access_kregistry.h"

#include "cuttlefish/common/libs/utils/files.h"
#include "cuttlefish/host/libs/config/config_instance_derived.h"
#include "cuttlefish/host/libs/config/cuttlefish_config.h"
#include "cuttlefish/host/libs/config/cuttlefish_config_paths.h"
#include "cuttlefish/host/libs/config/data_image.h"
#include "cuttlefish/result/result.h"

Expand Down
2 changes: 1 addition & 1 deletion base/cvd/cuttlefish/host/commands/assemble_cvd/disk/hwcomposer_pmem.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
#include "cuttlefish/host/commands/assemble_cvd/disk/hwcomposer_pmem.h"

#include "cuttlefish/common/libs/utils/files.h"
#include "cuttlefish/host/libs/config/config_instance_derived.h"
#include "cuttlefish/host/libs/config/cuttlefish_config.h"
#include "cuttlefish/host/libs/config/cuttlefish_config_paths.h"
#include "cuttlefish/host/libs/config/data_image.h"
#include "cuttlefish/result/result.h"

Expand Down
2 changes: 1 addition & 1 deletion base/cvd/cuttlefish/host/commands/assemble_cvd/disk/pflash.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
#include "cuttlefish/host/commands/assemble_cvd/disk/pflash.h"

#include "cuttlefish/common/libs/utils/files.h"
#include "cuttlefish/host/libs/config/config_instance_derived.h"
#include "cuttlefish/host/libs/config/cuttlefish_config.h"
#include "cuttlefish/host/libs/config/cuttlefish_config_paths.h"
#include "cuttlefish/host/libs/config/data_image.h"
#include "cuttlefish/result/result.h"

Expand Down
2 changes: 1 addition & 1 deletion base/cvd/cuttlefish/host/commands/assemble_cvd/disk/pstore.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
#include "cuttlefish/host/commands/assemble_cvd/disk/pstore.h"

#include "cuttlefish/common/libs/utils/files.h"
#include "cuttlefish/host/libs/config/config_instance_derived.h"
#include "cuttlefish/host/libs/config/cuttlefish_config.h"
#include "cuttlefish/host/libs/config/cuttlefish_config_paths.h"
#include "cuttlefish/host/libs/config/data_image.h"
#include "cuttlefish/result/result.h"

Expand Down
2 changes: 1 addition & 1 deletion base/cvd/cuttlefish/host/commands/console_forwarder/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ cf_cc_binary(
deps = [
"//cuttlefish/common/libs/fs",
"//cuttlefish/host/commands/kernel_log_monitor:kernel_log_monitor_utils",
"//cuttlefish/host/libs/config:config_instance_derived",
"//cuttlefish/host/libs/config:cuttlefish_config",
"//cuttlefish/host/libs/config:cuttlefish_config_paths",
"//cuttlefish/host/libs/config:logging",
"//cuttlefish/posix:strerror",
"//libbase",
Expand Down
2 changes: 1 addition & 1 deletion base/cvd/cuttlefish/host/commands/console_forwarder/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@

#include "cuttlefish/common/libs/fs/shared_fd.h"
#include "cuttlefish/common/libs/fs/shared_select.h"
#include "cuttlefish/host/libs/config/config_instance_derived.h"
#include "cuttlefish/host/libs/config/cuttlefish_config.h"
#include "cuttlefish/host/libs/config/cuttlefish_config_paths.h"
#include "cuttlefish/host/libs/config/logging.h"
#include "cuttlefish/posix/strerror.h"

Expand Down
2 changes: 1 addition & 1 deletion base/cvd/cuttlefish/host/commands/kernel_log_monitor/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ cf_cc_binary(
deps = [
":kernel_log_monitor_utils",
"//cuttlefish/common/libs/fs",
"//cuttlefish/host/libs/config:config_instance_derived",
"//cuttlefish/host/libs/config:cuttlefish_config",
"//cuttlefish/host/libs/config:cuttlefish_config_paths",
"//cuttlefish/host/libs/config:logging",
"//cuttlefish/result",
"//libbase",
Expand Down
2 changes: 1 addition & 1 deletion base/cvd/cuttlefish/host/commands/kernel_log_monitor/main.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
#include "cuttlefish/common/libs/fs/shared_select.h"
#include "cuttlefish/host/commands/kernel_log_monitor/kernel_log_server.h"
#include "cuttlefish/host/commands/kernel_log_monitor/utils.h"
#include "cuttlefish/host/libs/config/config_instance_derived.h"
#include "cuttlefish/host/libs/config/cuttlefish_config.h"
#include "cuttlefish/host/libs/config/cuttlefish_config_paths.h"
#include "cuttlefish/host/libs/config/logging.h"

DEFINE_int32(log_pipe_fd, -1,
Expand Down
2 changes: 1 addition & 1 deletion base/cvd/cuttlefish/host/commands/logcat_receiver/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ cf_cc_binary(
],
deps = [
"//cuttlefish/common/libs/fs",
"//cuttlefish/host/libs/config:config_instance_derived",
"//cuttlefish/host/libs/config:cuttlefish_config",
"//cuttlefish/host/libs/config:cuttlefish_config_paths",
"//cuttlefish/host/libs/config:logging",
"//libbase",
"@abseil-cpp//absl/log",
Expand Down
2 changes: 1 addition & 1 deletion base/cvd/cuttlefish/host/commands/logcat_receiver/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@

#include "cuttlefish/common/libs/fs/shared_buf.h"
#include "cuttlefish/common/libs/fs/shared_fd.h"
#include "cuttlefish/host/libs/config/config_instance_derived.h"
#include "cuttlefish/host/libs/config/cuttlefish_config.h"
#include "cuttlefish/host/libs/config/cuttlefish_config_paths.h"
#include "cuttlefish/host/libs/config/logging.h"

DEFINE_int32(log_pipe_fd, -1,
Expand Down
4 changes: 2 additions & 2 deletions base/cvd/cuttlefish/host/commands/run_cvd/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ cf_cc_library(
"//cuttlefish/host/commands/run_cvd:validate",
"//cuttlefish/host/libs/command_util",
"//cuttlefish/host/libs/config:config_constants",
"//cuttlefish/host/libs/config:config_instance_derived",
"//cuttlefish/host/libs/config:config_utils",
"//cuttlefish/host/libs/config:cuttlefish_config",
"//cuttlefish/host/libs/config:cuttlefish_config_paths",
"//cuttlefish/host/libs/feature",
"//cuttlefish/host/libs/vm_manager",
"//cuttlefish/posix:strerror",
Expand Down Expand Up @@ -137,9 +137,9 @@ cf_cc_library(
"//cuttlefish/host/libs/command_util:libcuttlefish_run_cvd_proto",
"//cuttlefish/host/libs/config:ap_boot_flow",
"//cuttlefish/host/libs/config:config_constants",
"//cuttlefish/host/libs/config:config_instance_derived",
"//cuttlefish/host/libs/config:config_utils",
"//cuttlefish/host/libs/config:cuttlefish_config",
"//cuttlefish/host/libs/config:cuttlefish_config_paths",
"//cuttlefish/host/libs/config:data_image",
"//cuttlefish/host/libs/config:vmm_mode",
"//cuttlefish/host/libs/feature",
Expand Down
2 changes: 1 addition & 1 deletion base/cvd/cuttlefish/host/commands/run_cvd/boot_state_machine.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@
#include "cuttlefish/host/libs/command_util/runner/defs.h"
#include "cuttlefish/host/libs/command_util/util.h"
#include "cuttlefish/host/libs/config/config_constants.h"
#include "cuttlefish/host/libs/config/config_instance_derived.h"
#include "cuttlefish/host/libs/config/config_utils.h"
#include "cuttlefish/host/libs/config/cuttlefish_config.h"
#include "cuttlefish/host/libs/config/cuttlefish_config_paths.h"
#include "cuttlefish/host/libs/feature/feature.h"
#include "cuttlefish/host/libs/feature/kernel_log_pipe_provider.h"
#include "cuttlefish/host/libs/vm_manager/vm_manager.h"
Expand Down
8 changes: 4 additions & 4 deletions base/cvd/cuttlefish/host/commands/run_cvd/launch/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ cf_cc_library(
deps = [
"//cuttlefish/common/libs/fs",
"//cuttlefish/common/libs/utils:subprocess",
"//cuttlefish/host/libs/config:config_instance_derived",
"//cuttlefish/host/libs/config:cuttlefish_config",
"//cuttlefish/host/libs/config:cuttlefish_config_paths",
"//cuttlefish/host/libs/config:known_paths",
"//cuttlefish/host/libs/feature",
"//cuttlefish/result",
Expand Down Expand Up @@ -175,8 +175,8 @@ cf_cc_library(
deps = [
"//cuttlefish/common/libs/utils:subprocess",
"//cuttlefish/host/commands/run_cvd:reporting",
"//cuttlefish/host/libs/config:config_instance_derived",
"//cuttlefish/host/libs/config:cuttlefish_config",
"//cuttlefish/host/libs/config:cuttlefish_config_paths",
"//cuttlefish/host/libs/config:known_paths",
"//cuttlefish/host/libs/config:logging",
"//cuttlefish/host/libs/feature",
Expand Down Expand Up @@ -210,8 +210,8 @@ cf_cc_library(
deps = [
"//cuttlefish/common/libs/fs",
"//cuttlefish/common/libs/utils:subprocess",
"//cuttlefish/host/libs/config:config_instance_derived",
"//cuttlefish/host/libs/config:cuttlefish_config",
"//cuttlefish/host/libs/config:cuttlefish_config_paths",
"//cuttlefish/host/libs/config:known_paths",
"//cuttlefish/host/libs/feature",
"//cuttlefish/result",
Expand Down Expand Up @@ -560,8 +560,8 @@ cf_cc_library(
"//cuttlefish/common/libs/utils:subprocess",
"//cuttlefish/host/commands/run_cvd/launch:enable_multitouch",
"//cuttlefish/host/commands/run_cvd/launch:log_tee_creator",
"//cuttlefish/host/libs/config:config_instance_derived",
"//cuttlefish/host/libs/config:cuttlefish_config",
"//cuttlefish/host/libs/config:cuttlefish_config_paths",
"//cuttlefish/host/libs/config:guest_os",
"//cuttlefish/host/libs/config:known_paths",
"//cuttlefish/host/libs/feature",
Expand Down
2 changes: 1 addition & 1 deletion base/cvd/cuttlefish/host/commands/run_cvd/launch/console_forwarder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@

#include "cuttlefish/common/libs/fs/shared_fd.h"
#include "cuttlefish/common/libs/utils/subprocess.h"
#include "cuttlefish/host/libs/config/config_instance_derived.h"
#include "cuttlefish/host/libs/config/cuttlefish_config.h"
#include "cuttlefish/host/libs/config/cuttlefish_config_paths.h"
#include "cuttlefish/host/libs/config/known_paths.h"
#include "cuttlefish/host/libs/feature/command_source.h"
#include "cuttlefish/result/result.h"
Expand Down
2 changes: 1 addition & 1 deletion base/cvd/cuttlefish/host/commands/run_cvd/launch/kernel_log_monitor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@

#include "cuttlefish/common/libs/utils/subprocess.h"
#include "cuttlefish/host/commands/run_cvd/reporting.h"
#include "cuttlefish/host/libs/config/config_instance_derived.h"
#include "cuttlefish/host/libs/config/cuttlefish_config.h"
#include "cuttlefish/host/libs/config/cuttlefish_config_paths.h"
#include "cuttlefish/host/libs/config/known_paths.h"
#include "cuttlefish/host/libs/feature/command_source.h"
#include "cuttlefish/host/libs/feature/feature.h"
Expand Down
2 changes: 1 addition & 1 deletion base/cvd/cuttlefish/host/commands/run_cvd/launch/logcat_receiver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

#include "cuttlefish/common/libs/fs/shared_fd.h"
#include "cuttlefish/common/libs/utils/subprocess.h"
#include "cuttlefish/host/libs/config/config_instance_derived.h"
#include "cuttlefish/host/libs/config/cuttlefish_config.h"
#include "cuttlefish/host/libs/config/cuttlefish_config_paths.h"
#include "cuttlefish/host/libs/config/known_paths.h"
#include "cuttlefish/host/libs/feature/command_source.h"
#include "cuttlefish/result/result.h"
Expand Down
2 changes: 1 addition & 1 deletion base/cvd/cuttlefish/host/commands/run_cvd/launch/vhost_input_devices.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
#include "cuttlefish/common/libs/utils/subprocess.h"
#include "cuttlefish/host/commands/run_cvd/launch/enable_multitouch.h"
#include "cuttlefish/host/commands/run_cvd/launch/log_tee_creator.h"
#include "cuttlefish/host/libs/config/config_instance_derived.h"
#include "cuttlefish/host/libs/config/cuttlefish_config.h"
#include "cuttlefish/host/libs/config/cuttlefish_config_paths.h"
#include "cuttlefish/host/libs/config/known_paths.h"
#include "cuttlefish/host/libs/feature/command_source.h"
#include "cuttlefish/host/libs/feature/feature.h"
Expand Down
2 changes: 1 addition & 1 deletion base/cvd/cuttlefish/host/commands/run_cvd/server_loop_impl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@
#include "cuttlefish/host/libs/command_util/runner/run_cvd.pb.h"
#include "cuttlefish/host/libs/command_util/util.h"
#include "cuttlefish/host/libs/config/ap_boot_flow.h"
#include "cuttlefish/host/libs/config/config_instance_derived.h"
#include "cuttlefish/host/libs/config/cuttlefish_config.h"
#include "cuttlefish/host/libs/config/cuttlefish_config_paths.h"
#include "cuttlefish/host/libs/config/data_image.h"
#include "cuttlefish/host/libs/config/vmm_mode.h"
#include "cuttlefish/host/libs/feature/command_source.h"
Expand Down
2 changes: 1 addition & 1 deletion base/cvd/cuttlefish/host/libs/command_util/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ cf_cc_library(
"//cuttlefish/common/libs/utils:environment",
"//cuttlefish/common/libs/utils:files",
"//cuttlefish/common/libs/utils:json",
"//cuttlefish/host/libs/config:config_instance_derived",
"//cuttlefish/host/libs/config:cuttlefish_config",
"//cuttlefish/host/libs/config:cuttlefish_config_paths",
"//cuttlefish/posix:strerror",
"//cuttlefish/posix:symlink",
"//cuttlefish/result",
Expand Down
2 changes: 1 addition & 1 deletion base/cvd/cuttlefish/host/libs/command_util/util.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
#include "cuttlefish/common/libs/fs/shared_select.h"
#include "cuttlefish/host/libs/command_util/runner/defs.h"
#include "cuttlefish/host/libs/command_util/runner/run_cvd.pb.h"
#include "cuttlefish/host/libs/config/config_instance_derived.h"
#include "cuttlefish/host/libs/config/cuttlefish_config.h"
#include "cuttlefish/host/libs/config/cuttlefish_config_paths.h"
#include "cuttlefish/posix/strerror.h"
#include "cuttlefish/result/result.h"

Expand Down
6 changes: 3 additions & 3 deletions base/cvd/cuttlefish/host/libs/config/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ cf_cc_library(
)

cf_cc_library(
name = "config_instance_derived",
srcs = ["config_instance_derived.cc"],
hdrs = ["config_instance_derived.h"],
name = "cuttlefish_config_paths",
srcs = ["cuttlefish_config_paths.cc"],
hdrs = ["cuttlefish_config_paths.h"],
deps = [
"//cuttlefish/common/libs/utils:files",
"//cuttlefish/host/libs/config:cuttlefish_config",
Expand Down
3 changes: 1 addition & 2 deletions ...st/libs/config/config_instance_derived.cc → ...st/libs/config/cuttlefish_config_paths.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "cuttlefish/host/libs/config/config_instance_derived.h"
#include "cuttlefish/host/libs/config/cuttlefish_config_paths.h"

#include <string>

Expand Down Expand Up @@ -96,4 +96,3 @@ std::string RestoreAdbdPipeName(const CuttlefishConfig::InstanceSpecific& ins) {
}

} // namespace cuttlefish

1 change: 0 additions & 1 deletion ...ost/libs/config/config_instance_derived.h → ...ost/libs/config/cuttlefish_config_paths.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,3 @@ std::string SwitchesSocketPath(const CuttlefishConfig::InstanceSpecific&);
std::string RestoreAdbdPipeName(const CuttlefishConfig::InstanceSpecific&);

} // namespace cuttlefish

2 changes: 1 addition & 1 deletion base/cvd/cuttlefish/host/libs/vm_manager/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ cf_cc_library(
"//cuttlefish/common/libs/utils:wait_for_unix_socket",
"//cuttlefish/host/libs/command_util",
"//cuttlefish/host/libs/config:config_constants",
"//cuttlefish/host/libs/config:config_instance_derived",
"//cuttlefish/host/libs/config:cuttlefish_config",
"//cuttlefish/host/libs/config:cuttlefish_config_paths",
"//cuttlefish/host/libs/config:external_network_mode",
"//cuttlefish/host/libs/config:gpu_mode",
"//cuttlefish/host/libs/config:guest_hwui_renderer",
Expand Down
2 changes: 1 addition & 1 deletion base/cvd/cuttlefish/host/libs/vm_manager/crosvm_manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
#include "cuttlefish/common/libs/utils/wait_for_unix_socket.h"
#include "cuttlefish/host/libs/command_util/snapshot_utils.h"
#include "cuttlefish/host/libs/config/config_constants.h"
#include "cuttlefish/host/libs/config/config_instance_derived.h"
#include "cuttlefish/host/libs/config/cuttlefish_config.h"
#include "cuttlefish/host/libs/config/cuttlefish_config_paths.h"
#include "cuttlefish/host/libs/config/gpu_mode.h"
#include "cuttlefish/host/libs/config/guest_hwui_renderer.h"
#include "cuttlefish/host/libs/config/guest_renderer_preload.h"
Expand Down
2 changes: 1 addition & 1 deletion base/cvd/cuttlefish/host/libs/vm_manager/qemu_manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
#include "cuttlefish/common/libs/utils/subprocess_managed_stdio.h"
#include "cuttlefish/common/libs/utils/wait_for_unix_socket.h"
#include "cuttlefish/host/libs/config/config_constants.h"
#include "cuttlefish/host/libs/config/config_instance_derived.h"
#include "cuttlefish/host/libs/config/cuttlefish_config.h"
#include "cuttlefish/host/libs/config/cuttlefish_config_paths.h"
#include "cuttlefish/host/libs/config/external_network_mode.h"
#include "cuttlefish/host/libs/config/gpu_mode.h"
#include "cuttlefish/host/libs/feature/command_source.h"
Expand Down
Loading