Skip to content

Commit d69636a

Browse files
DatabeanDatabean
committed
Move subprocess.* to cuttlefish/process/command_subprocess.*
Bug: b/533572315
1 parent ad07529 commit d69636a

123 files changed

Lines changed: 200 additions & 194 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎base/cvd/allocd/BUILD.bazel‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ cf_cc_library(
3737
"//cuttlefish/common/libs/fs",
3838
"//cuttlefish/common/libs/utils:files",
3939
"//cuttlefish/common/libs/utils:network",
40-
"//cuttlefish/common/libs/utils:subprocess",
4140
"//cuttlefish/host/commands/cvd/utils:common",
4241
"//cuttlefish/host/libs/config:logging",
42+
"//cuttlefish/process:command_subprocess",
4343
"//cuttlefish/result",
4444
"@abseil-cpp//absl/base:no_destructor",
4545
"@abseil-cpp//absl/log",
@@ -53,7 +53,7 @@ cf_cc_library(
5353
srcs = ["alloc_iproute2.cpp"],
5454
hdrs = ["alloc_driver.h"],
5555
deps = [
56-
"//cuttlefish/common/libs/utils:subprocess",
56+
"//cuttlefish/process:command_subprocess",
5757
"//cuttlefish/result",
5858
"@abseil-cpp//absl/log",
5959
"@abseil-cpp//absl/strings",
@@ -68,7 +68,7 @@ cf_cc_library(
6868
deps = [
6969
"//allocd/net:netlink",
7070
"//cuttlefish/common/libs/fs",
71-
"//cuttlefish/common/libs/utils:subprocess",
71+
"//cuttlefish/process:command_subprocess",
7272
"//cuttlefish/result",
7373
"//libbase",
7474
"@abseil-cpp//absl/log",

‎base/cvd/allocd/alloc_iproute2.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include "absl/strings/str_cat.h"
2020

2121
#include "allocd/alloc_driver.h"
22-
#include "cuttlefish/common/libs/utils/subprocess.h"
22+
#include "cuttlefish/process/command_subprocess.h"
2323
#include "cuttlefish/result/result.h"
2424

2525
namespace cuttlefish {

‎base/cvd/allocd/alloc_netlink.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
#include "allocd/net/netlink_client.h"
4444
#include "allocd/net/netlink_request.h"
4545
#include "cuttlefish/common/libs/fs/shared_fd.h"
46-
#include "cuttlefish/common/libs/utils/subprocess.h"
46+
#include "cuttlefish/process/command_subprocess.h"
4747
#include "cuttlefish/result/result.h"
4848

4949
namespace cuttlefish {

‎base/cvd/allocd/alloc_utils.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
#include "cuttlefish/common/libs/fs/shared_fd.h"
3737
#include "cuttlefish/common/libs/utils/files.h"
3838
#include "cuttlefish/common/libs/utils/network.h"
39-
#include "cuttlefish/common/libs/utils/subprocess.h"
4039
#include "cuttlefish/host/commands/cvd/utils/common.h"
40+
#include "cuttlefish/process/command_subprocess.h"
4141
#include "cuttlefish/result/result.h"
4242

4343
#ifdef __linux__

‎base/cvd/cuttlefish/common/libs/utils/BUILD.bazel‎

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ cf_cc_library(
99
srcs = ["archive.cpp"],
1010
hdrs = ["archive.h"],
1111
deps = [
12-
"//cuttlefish/common/libs/utils:subprocess",
12+
"//cuttlefish/process:command_subprocess",
1313
"//cuttlefish/process:managed_stdio",
1414
"//cuttlefish/result",
1515
"//libbase",
@@ -73,7 +73,7 @@ cf_cc_library(
7373
srcs = ["disk_usage.cpp"],
7474
hdrs = ["disk_usage.h"],
7575
deps = [
76-
"//cuttlefish/common/libs/utils:subprocess",
76+
"//cuttlefish/process:command_subprocess",
7777
"//cuttlefish/process:managed_stdio",
7878
"//cuttlefish/result",
7979
"//libbase",
@@ -337,22 +337,6 @@ cf_cc_library(
337337
],
338338
)
339339

340-
cf_cc_library(
341-
name = "subprocess",
342-
srcs = ["subprocess.cpp"],
343-
hdrs = ["subprocess.h"],
344-
deps = [
345-
"//cuttlefish/common/libs/fs",
346-
"//cuttlefish/common/libs/utils:contains",
347-
"//cuttlefish/common/libs/utils:files",
348-
"//cuttlefish/result",
349-
"//libbase",
350-
"@abseil-cpp//absl/log",
351-
"@abseil-cpp//absl/log:check",
352-
"@abseil-cpp//absl/strings",
353-
],
354-
)
355-
356340
cf_cc_library(
357341
name = "tee_logging",
358342
srcs = ["tee_logging.cpp"],
@@ -464,8 +448,8 @@ cf_cc_library(
464448
hdrs = ["wait_for_unix_socket.h"],
465449
deps = [
466450
"//cuttlefish/common/libs/utils:files",
467-
"//cuttlefish/common/libs/utils:subprocess",
468451
"//cuttlefish/common/libs/utils:wait_for_file",
452+
"//cuttlefish/process:command_subprocess",
469453
"//cuttlefish/process:managed_stdio",
470454
"//cuttlefish/result",
471455
"@abseil-cpp//absl/log",

‎base/cvd/cuttlefish/common/libs/utils/archive.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include "absl/strings/str_split.h"
2828
#include "absl/strings/strip.h"
2929

30-
#include "cuttlefish/common/libs/utils/subprocess.h"
30+
#include "cuttlefish/process/command_subprocess.h"
3131
#include "cuttlefish/process/managed_stdio.h"
3232
#include "cuttlefish/result/result.h"
3333

‎base/cvd/cuttlefish/common/libs/utils/disk_usage.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include "absl/strings/numbers.h"
2626
#include "absl/strings/str_split.h"
2727

28-
#include "cuttlefish/common/libs/utils/subprocess.h"
28+
#include "cuttlefish/process/command_subprocess.h"
2929
#include "cuttlefish/process/managed_stdio.h"
3030
#include "cuttlefish/result/result.h"
3131

‎base/cvd/cuttlefish/common/libs/utils/wait_for_unix_socket.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
#include "absl/log/log.h"
2424

2525
#include "cuttlefish/common/libs/utils/files.h"
26-
#include "cuttlefish/common/libs/utils/subprocess.h"
2726
#include "cuttlefish/common/libs/utils/wait_for_file.h"
27+
#include "cuttlefish/process/command_subprocess.h"
2828
#include "cuttlefish/process/managed_stdio.h"
2929
#include "cuttlefish/result/result.h"
3030

‎base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ cf_cc_library(
9191
deps = [
9292
"//cuttlefish/common/libs/utils:files",
9393
"//cuttlefish/common/libs/utils:size_utils",
94-
"//cuttlefish/common/libs/utils:subprocess",
9594
"//cuttlefish/host/commands/assemble_cvd:bootconfig_args",
9695
"//cuttlefish/host/libs/avb",
9796
"//cuttlefish/host/libs/config:ap_boot_flow",
@@ -100,6 +99,7 @@ cf_cc_library(
10099
"//cuttlefish/host/libs/config:kernel_args",
101100
"//cuttlefish/host/libs/config:mkenvimage_slim",
102101
"//cuttlefish/host/libs/vm_manager",
102+
"//cuttlefish/process:command_subprocess",
103103
"//cuttlefish/result",
104104
"//libbase",
105105
"@abseil-cpp//absl/log",
@@ -115,7 +115,6 @@ cf_cc_library(
115115
deps = [
116116
"//cuttlefish/common/libs/fs",
117117
"//cuttlefish/common/libs/utils:files",
118-
"//cuttlefish/common/libs/utils:subprocess",
119118
"//cuttlefish/host/commands/assemble_cvd/boot_image",
120119
"//cuttlefish/host/commands/assemble_cvd/boot_image:boot_image_builder",
121120
"//cuttlefish/host/commands/assemble_cvd/boot_image:vendor_boot_image",
@@ -136,6 +135,7 @@ cf_cc_library(
136135
"//cuttlefish/io:shared_fd",
137136
"//cuttlefish/io:string",
138137
"//cuttlefish/io:write_exact",
138+
"//cuttlefish/process:command_subprocess",
139139
"//cuttlefish/result",
140140
"//libbase",
141141
"@abseil-cpp//absl/log",
@@ -398,7 +398,6 @@ cf_cc_library(
398398
"//cuttlefish/common/libs/utils:files",
399399
"//cuttlefish/common/libs/utils:host_info",
400400
"//cuttlefish/common/libs/utils:in_sandbox",
401-
"//cuttlefish/common/libs/utils:subprocess",
402401
"//cuttlefish/host/commands/assemble_cvd:boot_image_utils",
403402
"//cuttlefish/host/commands/assemble_cvd:guest_config_cc_proto",
404403
"//cuttlefish/host/commands/assemble_cvd/flags:boot_image",
@@ -411,6 +410,7 @@ cf_cc_library(
411410
"//cuttlefish/pretty:optional",
412411
"//cuttlefish/pretty:string",
413412
"//cuttlefish/pretty:struct",
413+
"//cuttlefish/process:command_subprocess",
414414
"//cuttlefish/process:managed_stdio",
415415
"//cuttlefish/result",
416416
"//libbase",
@@ -430,7 +430,6 @@ cf_cc_library(
430430
"//cuttlefish/common/libs/utils:files",
431431
"//cuttlefish/common/libs/utils:host_info",
432432
"//cuttlefish/common/libs/utils:semver",
433-
"//cuttlefish/common/libs/utils:subprocess",
434433
"//cuttlefish/host/commands/assemble_cvd:guest_config",
435434
"//cuttlefish/host/graphics_detector:graphics_detector_cc_proto",
436435
"//cuttlefish/host/libs/config:config_constants",
@@ -439,6 +438,7 @@ cf_cc_library(
439438
"//cuttlefish/host/libs/config:guest_hwui_renderer",
440439
"//cuttlefish/host/libs/config:guest_renderer_preload",
441440
"//cuttlefish/host/libs/config:vmm_mode",
441+
"//cuttlefish/process:command_subprocess",
442442
"//cuttlefish/process:managed_stdio",
443443
"//cuttlefish/result",
444444
"//libbase",
@@ -578,14 +578,14 @@ cf_cc_library(
578578
"//cuttlefish/common/libs/utils:archive",
579579
"//cuttlefish/common/libs/utils:contains",
580580
"//cuttlefish/common/libs/utils:files",
581-
"//cuttlefish/common/libs/utils:subprocess",
582581
"//cuttlefish/host/commands/assemble_cvd:misc_info",
583582
"//cuttlefish/host/libs/avb",
584583
"//cuttlefish/host/libs/config:config_utils",
585584
"//cuttlefish/host/libs/config:cuttlefish_config",
586585
"//cuttlefish/host/libs/config:fetcher_config",
587586
"//cuttlefish/host/libs/config:file_source",
588587
"//cuttlefish/host/libs/config:known_paths",
588+
"//cuttlefish/process:command_subprocess",
589589
"//cuttlefish/result",
590590
"//libbase",
591591
"@abseil-cpp//absl/log",
@@ -619,13 +619,13 @@ cf_cc_library(
619619
"//cuttlefish/common/libs/utils:disk_usage",
620620
"//cuttlefish/common/libs/utils:environment",
621621
"//cuttlefish/common/libs/utils:files",
622-
"//cuttlefish/common/libs/utils:subprocess",
623622
"//cuttlefish/host/commands/assemble_cvd:boot_image_utils",
624623
"//cuttlefish/host/commands/assemble_cvd:kernel_module_parser",
625624
"//cuttlefish/host/libs/avb",
626625
"//cuttlefish/host/libs/config:config_utils",
627626
"//cuttlefish/host/libs/config:known_paths",
628627
"//cuttlefish/io:shared_fd",
628+
"//cuttlefish/process:command_subprocess",
629629
"//cuttlefish/result",
630630
"//libbase",
631631
"@abseil-cpp//absl/log",

‎base/cvd/cuttlefish/host/commands/assemble_cvd/boot_image_utils.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131

3232
#include "cuttlefish/common/libs/fs/shared_fd.h"
3333
#include "cuttlefish/common/libs/utils/files.h"
34-
#include "cuttlefish/common/libs/utils/subprocess.h"
3534
#include "cuttlefish/host/commands/assemble_cvd/boot_image/boot_image.h"
3635
#include "cuttlefish/host/commands/assemble_cvd/boot_image/boot_image_builder.h"
3736
#include "cuttlefish/host/commands/assemble_cvd/boot_image/vendor_boot_image.h"
@@ -50,6 +49,7 @@
5049
#include "cuttlefish/io/shared_fd.h"
5150
#include "cuttlefish/io/string.h"
5251
#include "cuttlefish/io/write_exact.h"
52+
#include "cuttlefish/process/command_subprocess.h"
5353
#include "cuttlefish/result/result.h"
5454

5555
namespace cuttlefish {

0 commit comments

Comments
 (0)