update_engine: Update for new location for brillo processes
These files have moved into a subdirectory. Update the code so they can
still be found.
BUG=chromium:1085464
TEST=emerge-nami update_engine
Will also use pre-CQ
Change-Id: I85d89b6efa960e77bb56f67ab432c734e8fea8ea
Reviewed-on: https://chromium-review.googlesource.com/c/aosp/platform/system/update_engine/+/2212760
Tested-by: Simon Glass <sjg@chromium.org>
Commit-Queue: Simon Glass <sjg@chromium.org>
Reviewed-by: Amin Hassani <ahassani@chromium.org>
diff --git a/common/http_fetcher_unittest.cc b/common/http_fetcher_unittest.cc
index 589579e..3ecb996 100644
--- a/common/http_fetcher_unittest.cc
+++ b/common/http_fetcher_unittest.cc
@@ -37,7 +37,7 @@
#include <brillo/message_loops/base_message_loop.h>
#include <brillo/message_loops/message_loop.h>
#include <brillo/message_loops/message_loop_utils.h>
-#include <brillo/process.h>
+#include <brillo/process/process.h>
#include <brillo/streams/file_stream.h>
#include <brillo/streams/stream.h>
#include <gtest/gtest.h>
diff --git a/common/subprocess.cc b/common/subprocess.cc
index 45dff92..ff37472 100644
--- a/common/subprocess.cc
+++ b/common/subprocess.cc
@@ -32,7 +32,7 @@
#include <base/stl_util.h>
#include <base/strings/string_util.h>
#include <base/strings/stringprintf.h>
-#include <brillo/process.h>
+#include <brillo/process/process.h>
#include <brillo/secure_blob.h>
#include "update_engine/common/utils.h"
diff --git a/common/subprocess.h b/common/subprocess.h
index 3eda8d5..e1a7ce3 100644
--- a/common/subprocess.h
+++ b/common/subprocess.h
@@ -30,8 +30,8 @@
#include <base/macros.h>
#include <brillo/asynchronous_signal_handler_interface.h>
#include <brillo/message_loops/message_loop.h>
-#include <brillo/process.h>
-#include <brillo/process_reaper.h>
+#include <brillo/process/process.h>
+#include <brillo/process/process_reaper.h>
#include <gtest/gtest_prod.h> // for FRIEND_TEST
// The Subprocess class is a singleton. It's used to spawn off a subprocess