Skip to content

Commit ad07529

Browse files
committed
Create a cuttlefish/process dir with managed_stdio.*
Bug: b/533572315
1 parent 0e00d69 commit ad07529

42 files changed

Lines changed: 70 additions & 63 deletions

Some content is hidden

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

base/cvd/adb/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
load("@protobuf//bazel:cc_proto_library.bzl", "cc_proto_library")
22
load("@protobuf//bazel:proto_library.bzl", "proto_library")
33
load("@rules_cc//cc:cc_binary.bzl", "cc_binary")
4-
54
load("//:build_variables.bzl", "COPTS")
65

76
package(

base/cvd/build_external/e2fsprogs/BUILD.bazel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ cc_library(
3131
hdrs = [
3232
"lib/ext2fs/crc32c_table.h",
3333
],
34+
features = ["-parse_headers"],
3435
strip_include_prefix = "//build_external/e2fsprogs/lib/ext2fs",
3536
deps = [
3637
":libext2fs_generated",
3738
],
38-
features = ["-parse_headers"],
3939
)
4040

4141
cc_library(
@@ -52,10 +52,10 @@ cc_library(
5252
hdrs = [
5353
"lib/support/prof_err.h",
5454
],
55+
strip_include_prefix = "//build_external/e2fsprogs/lib",
5556
deps = [
5657
"@e2fsprogs//:libext2_com_err_headers",
5758
],
58-
strip_include_prefix = "//build_external/e2fsprogs/lib",
5959
)
6060

6161
cc_library(
@@ -66,10 +66,10 @@ cc_library(
6666
hdrs = [
6767
"lib/support/prof_err.h",
6868
],
69+
strip_include_prefix = "//build_external/e2fsprogs/lib/support",
6970
deps = [
7071
"@e2fsprogs//:libext2_com_err_headers",
7172
],
72-
strip_include_prefix = "//build_external/e2fsprogs/lib/support",
7373
)
7474

7575
cc_library(

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

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ cf_cc_library(
1010
hdrs = ["archive.h"],
1111
deps = [
1212
"//cuttlefish/common/libs/utils:subprocess",
13-
"//cuttlefish/common/libs/utils:subprocess_managed_stdio",
13+
"//cuttlefish/process:managed_stdio",
1414
"//cuttlefish/result",
1515
"//libbase",
1616
"@abseil-cpp//absl/log",
@@ -74,7 +74,7 @@ cf_cc_library(
7474
hdrs = ["disk_usage.h"],
7575
deps = [
7676
"//cuttlefish/common/libs/utils:subprocess",
77-
"//cuttlefish/common/libs/utils:subprocess_managed_stdio",
77+
"//cuttlefish/process:managed_stdio",
7878
"//cuttlefish/result",
7979
"//libbase",
8080
"@abseil-cpp//absl/strings",
@@ -353,19 +353,6 @@ cf_cc_library(
353353
],
354354
)
355355

356-
cf_cc_library(
357-
name = "subprocess_managed_stdio",
358-
srcs = ["subprocess_managed_stdio.cc"],
359-
hdrs = ["subprocess_managed_stdio.h"],
360-
deps = [
361-
"//cuttlefish/common/libs/fs",
362-
"//cuttlefish/common/libs/utils:subprocess",
363-
"//cuttlefish/result",
364-
"//libbase",
365-
"@abseil-cpp//absl/log",
366-
],
367-
)
368-
369356
cf_cc_library(
370357
name = "tee_logging",
371358
srcs = ["tee_logging.cpp"],
@@ -478,8 +465,8 @@ cf_cc_library(
478465
deps = [
479466
"//cuttlefish/common/libs/utils:files",
480467
"//cuttlefish/common/libs/utils:subprocess",
481-
"//cuttlefish/common/libs/utils:subprocess_managed_stdio",
482468
"//cuttlefish/common/libs/utils:wait_for_file",
469+
"//cuttlefish/process:managed_stdio",
483470
"//cuttlefish/result",
484471
"@abseil-cpp//absl/log",
485472
],

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

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

3030
#include "cuttlefish/common/libs/utils/subprocess.h"
31-
#include "cuttlefish/common/libs/utils/subprocess_managed_stdio.h"
31+
#include "cuttlefish/process/managed_stdio.h"
3232
#include "cuttlefish/result/result.h"
3333

3434
namespace cuttlefish {

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

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

2828
#include "cuttlefish/common/libs/utils/subprocess.h"
29-
#include "cuttlefish/common/libs/utils/subprocess_managed_stdio.h"
29+
#include "cuttlefish/process/managed_stdio.h"
3030
#include "cuttlefish/result/result.h"
3131

3232
namespace cuttlefish {

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
@@ -24,8 +24,8 @@
2424

2525
#include "cuttlefish/common/libs/utils/files.h"
2626
#include "cuttlefish/common/libs/utils/subprocess.h"
27-
#include "cuttlefish/common/libs/utils/subprocess_managed_stdio.h"
2827
#include "cuttlefish/common/libs/utils/wait_for_file.h"
28+
#include "cuttlefish/process/managed_stdio.h"
2929
#include "cuttlefish/result/result.h"
3030

3131
namespace cuttlefish {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,6 @@ cf_cc_library(
399399
"//cuttlefish/common/libs/utils:host_info",
400400
"//cuttlefish/common/libs/utils:in_sandbox",
401401
"//cuttlefish/common/libs/utils:subprocess",
402-
"//cuttlefish/common/libs/utils:subprocess_managed_stdio",
403402
"//cuttlefish/host/commands/assemble_cvd:boot_image_utils",
404403
"//cuttlefish/host/commands/assemble_cvd:guest_config_cc_proto",
405404
"//cuttlefish/host/commands/assemble_cvd/flags:boot_image",
@@ -412,6 +411,7 @@ cf_cc_library(
412411
"//cuttlefish/pretty:optional",
413412
"//cuttlefish/pretty:string",
414413
"//cuttlefish/pretty:struct",
414+
"//cuttlefish/process:managed_stdio",
415415
"//cuttlefish/result",
416416
"//libbase",
417417
"@abseil-cpp//absl/strings",
@@ -431,7 +431,6 @@ cf_cc_library(
431431
"//cuttlefish/common/libs/utils:host_info",
432432
"//cuttlefish/common/libs/utils:semver",
433433
"//cuttlefish/common/libs/utils:subprocess",
434-
"//cuttlefish/common/libs/utils:subprocess_managed_stdio",
435434
"//cuttlefish/host/commands/assemble_cvd:guest_config",
436435
"//cuttlefish/host/graphics_detector:graphics_detector_cc_proto",
437436
"//cuttlefish/host/libs/config:config_constants",
@@ -440,6 +439,7 @@ cf_cc_library(
440439
"//cuttlefish/host/libs/config:guest_hwui_renderer",
441440
"//cuttlefish/host/libs/config:guest_renderer_preload",
442441
"//cuttlefish/host/libs/config:vmm_mode",
442+
"//cuttlefish/process:managed_stdio",
443443
"//cuttlefish/result",
444444
"//libbase",
445445
"@abseil-cpp//absl/log",

base/cvd/cuttlefish/host/commands/assemble_cvd/graphics_flags.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@
3434
#include "cuttlefish/common/libs/utils/host_info.h"
3535
#include "cuttlefish/common/libs/utils/semver.h"
3636
#include "cuttlefish/common/libs/utils/subprocess.h"
37-
#include "cuttlefish/common/libs/utils/subprocess_managed_stdio.h"
3837
#include "cuttlefish/host/graphics_detector/graphics_detector.pb.h"
3938
#include "cuttlefish/host/libs/config/config_constants.h"
4039
#include "cuttlefish/host/libs/config/cuttlefish_config.h"
4140
#include "cuttlefish/host/libs/config/gpu_mode.h"
4241
#include "cuttlefish/host/libs/config/guest_hwui_renderer.h"
4342
#include "cuttlefish/host/libs/config/guest_renderer_preload.h"
4443
#include "cuttlefish/host/libs/config/vmm_mode.h"
44+
#include "cuttlefish/process/managed_stdio.h"
4545
#include "cuttlefish/result/result.h"
4646

4747
#ifdef __APPLE__

base/cvd/cuttlefish/host/commands/assemble_cvd/guest_config.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
#include "cuttlefish/common/libs/utils/host_info.h"
3939
#include "cuttlefish/common/libs/utils/in_sandbox.h"
4040
#include "cuttlefish/common/libs/utils/subprocess.h"
41-
#include "cuttlefish/common/libs/utils/subprocess_managed_stdio.h"
4241
#include "cuttlefish/host/commands/assemble_cvd/boot_image_utils.h"
4342
#include "cuttlefish/host/commands/assemble_cvd/flags/boot_image.h"
4443
#include "cuttlefish/host/commands/assemble_cvd/flags/kernel_path.h"
@@ -49,6 +48,7 @@
4948
#include "cuttlefish/host/libs/config/gpu_mode.h"
5049
#include "cuttlefish/pretty/optional.h"
5150
#include "cuttlefish/pretty/string.h"
51+
#include "cuttlefish/process/managed_stdio.h"
5252
#include "cuttlefish/result/result.h"
5353

5454
namespace cuttlefish {

base/cvd/cuttlefish/host/commands/cvd/cli/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,12 +179,12 @@ cf_cc_library(
179179
"//cuttlefish/common/libs/utils:gflags_xml_parser",
180180
"//cuttlefish/common/libs/utils:in_sandbox",
181181
"//cuttlefish/common/libs/utils:subprocess",
182-
"//cuttlefish/common/libs/utils:subprocess_managed_stdio",
183182
"//cuttlefish/common/libs/utils:users",
184183
"//cuttlefish/flag_parser",
185184
"//cuttlefish/host/commands/cvd/instances:config_path",
186185
"//cuttlefish/host/commands/cvd/utils",
187186
"//cuttlefish/host/libs/config:config_constants",
187+
"//cuttlefish/process:managed_stdio",
188188
"//cuttlefish/result",
189189
"//libbase",
190190
"@abseil-cpp//absl/strings",

0 commit comments

Comments
 (0)