[skip ci] Merge "Use JoinPath from sandbox2 internals" into main

GitOrigin-RevId: 0ee299e

Author: Treehugger Robot

staging/host/commands/process_sandboxer/filesystem.cpp

@@ -18,7 +18,6 @@
 
 #include <cerrno>
 #include <deque>
-#include <initializer_list>
 #include <string>
 #include <string_view>
 
@@ -31,34 +30,6 @@
 
 namespace cuttlefish::process_sandboxer {
 
-// Copied from sandboxed_api/util/path.cc
-
-namespace internal {
-
-constexpr char kPathSeparator[] = "/";
-
-std::string JoinPathImpl(std::initializer_list<absl::string_view> paths) {
- std::string result;
- for (const auto& path : paths) {
- if (path.empty()) {
- continue;
- }
- if (result.empty()) {
- absl::StrAppend(&result, path);
- continue;
- }
- const auto comp = absl::StripPrefix(path, kPathSeparator);
- if (absl::EndsWith(result, kPathSeparator)) {
- absl::StrAppend(&result, comp);
- } else {
- absl::StrAppend(&result, kPathSeparator, comp);
- }
- }
- return result;
-}
-
-} // namespace internal
-
 // Copied from sandboxed_api/util/fileops.cc
 
 namespace {

staging/host/commands/process_sandboxer/filesystem.h

@@ -12,7 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <initializer_list>
 #include <string>
 #include <string_view>
 
@@ -23,20 +22,6 @@ namespace cuttlefish::process_sandboxer {
 // Recursively creates a directory, skipping segments that already exist.
 bool CreateDirectoryRecursively(const std::string& path, int mode);
 
-// Copied from sandboxed_api/util/path.h
-
-namespace internal {
-// Not part of the public API.
-std::string JoinPathImpl(std::initializer_list<std::string_view> paths);
-} // namespace internal
-
-// Joins multiple paths together using the platform-specific path separator.
-// Arguments must be convertible to absl::string_view.
-template <typename... T>
-inline std::string JoinPath(const T&... args) {
- return internal::JoinPathImpl({args...});
-}
-
 // Collapses duplicate "/"s, resolve ".." and "." path elements, removes
 // trailing "/".
 //

staging/host/commands/process_sandboxer/main.cpp

@@ -37,6 +37,7 @@
 #include <absl/status/status.h>
 #include <absl/strings/match.h>
 #include <absl/strings/str_cat.h>
+#include <sandboxed_api/util/path.h>
 
 #include "host/commands/process_sandboxer/filesystem.h"
 #include "host/commands/process_sandboxer/logs.h"
@@ -65,6 +66,8 @@ ABSL_FLAG(std::string, vsock_device_dir, "/tmp/vsock_3_1000",
 namespace cuttlefish::process_sandboxer {
 namespace {
 
+using sapi::file::JoinPath;
+
 std::optional<std::string_view> FromEnv(const std::string& name) {
  char* value = getenv(name.c_str());
  return value == NULL ? std::optional<std::string_view>() : value;

staging/host/commands/process_sandboxer/policies.cpp

@@ -31,12 +31,15 @@
 #include <absl/status/status.h>
 #include <sandboxed_api/sandbox2/policy.h>
 #include <sandboxed_api/sandbox2/policybuilder.h>
+#include <sandboxed_api/util/path.h>
 
 #include "host/commands/process_sandboxer/filesystem.h"
 #include "host/commands/process_sandboxer/proxy_common.h"
 
 namespace cuttlefish::process_sandboxer {
 
+using sapi::file::JoinPath;
+
 absl::Status HostInfo::EnsureOutputDirectoriesExist() {
  if (!CreateDirectoryRecursively(assembly_dir, 0700)) {
  return absl::ErrnoToStatus(errno, "Failed to create " + assembly_dir);

staging/host/commands/process_sandboxer/policies/assemble_cvd.cpp

@@ -25,11 +25,12 @@
 
 #include <sandboxed_api/sandbox2/policybuilder.h>
 #include <sandboxed_api/sandbox2/util/bpf_helper.h>
-
-#include "host/commands/process_sandboxer/filesystem.h"
+#include <sandboxed_api/util/path.h>
 
 namespace cuttlefish::process_sandboxer {
 
+using sapi::file::JoinPath;
+
 sandbox2::PolicyBuilder AssembleCvdPolicy(const HostInfo& host) {
  std::string sandboxer_proxy = host.HostToolExe("sandboxer_proxy");
  return BaselinePolicy(host, host.HostToolExe("assemble_cvd"))

staging/host/commands/process_sandboxer/policies/avbtool.cpp

@@ -27,11 +27,12 @@
 #include <absl/log/check.h>
 #include <sandboxed_api/sandbox2/policybuilder.h>
 #include <sandboxed_api/sandbox2/util/bpf_helper.h>
-
-#include "host/commands/process_sandboxer/filesystem.h"
+#include <sandboxed_api/util/path.h>
 
 namespace cuttlefish::process_sandboxer {
 
+using sapi::file::JoinPath;
+
 /*
  * This executable is built as a `python_binary_host`:
  * https://cs.android.com/android/platform/superproject/main/+/main:external/avb/Android.bp;l=136;drc=1bbcd661f0afe4ab56c7031f57d518a19015805e

staging/host/commands/process_sandboxer/policies/baseline.cpp

@@ -24,11 +24,12 @@
 
 #include <sandboxed_api/sandbox2/policybuilder.h>
 #include <sandboxed_api/sandbox2/util/bpf_helper.h>
-
-#include "host/commands/process_sandboxer/filesystem.h"
+#include <sandboxed_api/util/path.h>
 
 namespace cuttlefish::process_sandboxer {
 
+using sapi::file::JoinPath;
+
 sandbox2::PolicyBuilder BaselinePolicy(const HostInfo& host,
  std::string_view exe) {
  return sandbox2::PolicyBuilder()

staging/host/commands/process_sandboxer/policies/modem_simulator.cpp

@@ -24,11 +24,12 @@
 
 #include <sandboxed_api/sandbox2/policybuilder.h>
 #include <sandboxed_api/sandbox2/util/bpf_helper.h>
-
-#include "host/commands/process_sandboxer/filesystem.h"
+#include <sandboxed_api/util/path.h>
 
 namespace cuttlefish::process_sandboxer {
 
+using sapi::file::JoinPath;
+
 sandbox2::PolicyBuilder ModemSimulatorPolicy(const HostInfo& host) {
  return BaselinePolicy(host, host.HostToolExe("modem_simulator"))
  .AddDirectory(JoinPath(host.host_artifacts_path, "/etc/modem_simulator"))

staging/host/commands/process_sandboxer/policies/netsimd.cpp

@@ -29,11 +29,12 @@
 #include <sandboxed_api/sandbox2/allow_unrestricted_networking.h>
 #include <sandboxed_api/sandbox2/policybuilder.h>
 #include <sandboxed_api/sandbox2/util/bpf_helper.h>
-
-#include "host/commands/process_sandboxer/filesystem.h"
+#include <sandboxed_api/util/path.h>
 
 namespace cuttlefish::process_sandboxer {
 
+using sapi::file::JoinPath;
+
 sandbox2::PolicyBuilder NetsimdPolicy(const HostInfo& host) {
  return BaselinePolicy(host, host.HostToolExe("netsimd"))
  .AddDirectory(JoinPath(host.host_artifacts_path, "bin", "netsim-ui"))

staging/host/commands/process_sandboxer/policies/tombstone_receiver.cpp

@@ -19,11 +19,12 @@
 #include <sys/syscall.h>
 
 #include <sandboxed_api/sandbox2/policybuilder.h>
-
-#include "host/commands/process_sandboxer/filesystem.h"
+#include <sandboxed_api/util/path.h>
 
 namespace cuttlefish::process_sandboxer {
 
+using sapi::file::JoinPath;
+
 sandbox2::PolicyBuilder TombstoneReceiverPolicy(const HostInfo& host) {
  return BaselinePolicy(host, host.HostToolExe("tombstone_receiver"))
  .AddDirectory(host.log_dir, /* is_ro= */ false)