Merge "libsnapshot: Don't export snapuserd server includes."

fs_mgr/libsnapshot/snapuserd.cpp

@@ -14,12 +14,11 @@
  * limitations under the License.
  */
 
+#include "snapuserd.h"
+
 #include <csignal>
 
-#include <libsnapshot/snapuserd.h>
 #include <libsnapshot/snapuserd_client.h>
-#include <libsnapshot/snapuserd_daemon.h>
-#include <libsnapshot/snapuserd_server.h>
 
 namespace android {
 namespace snapshot {
@@ -824,18 +823,3 @@ bool Snapuserd::Run() {
 
 }  // namespace snapshot
 }  // namespace android
-
-int main([[maybe_unused]] int argc, char** argv) {
-    android::base::InitLogging(argv, &android::base::KernelLogger);
-
-    android::snapshot::Daemon& daemon = android::snapshot::Daemon::Instance();
-
-    std::string socket = android::snapshot::kSnapuserdSocket;
-    if (argc >= 2) {
-        socket = argv[1];
-    }
-    daemon.StartServer(socket);
-    daemon.Run();
-
-    return 0;
-}

fs_mgr/libsnapshot/snapuserd_daemon.cpp

@@ -14,8 +14,12 @@
  * limitations under the License.
  */
 
+#include "snapuserd_daemon.h"
+
 #include <android-base/logging.h>
-#include <libsnapshot/snapuserd_daemon.h>
+#include <libsnapshot/snapuserd_client.h>
+
+#include "snapuserd_server.h"
 
 namespace android {
 namespace snapshot {
@@ -89,3 +93,18 @@ void Daemon::SignalHandler(int signal) {
 
 }  // namespace snapshot
 }  // namespace android
+
+int main([[maybe_unused]] int argc, char** argv) {
+    android::base::InitLogging(argv, &android::base::KernelLogger);
+
+    android::snapshot::Daemon& daemon = android::snapshot::Daemon::Instance();
+
+    std::string socket = android::snapshot::kSnapuserdSocket;
+    if (argc >= 2) {
+        socket = argv[1];
+    }
+    daemon.StartServer(socket);
+    daemon.Run();
+
+    return 0;
+}

fs_mgr/libsnapshot/snapuserd_daemon.h

@@ -16,7 +16,7 @@
 
 #include <poll.h>
 
-#include <libsnapshot/snapuserd_server.h>
+#include "snapuserd_server.h"
 
 namespace android {
 namespace snapshot {

fs_mgr/libsnapshot/snapuserd_server.cpp

@@ -26,8 +26,9 @@
 #include <unistd.h>
 
 #include <android-base/logging.h>
-#include <libsnapshot/snapuserd.h>
+
-#include <libsnapshot/snapuserd_server.h>
+#include "snapuserd.h"
+#include "snapuserd_server.h"
 
 namespace android {
 namespace snapshot {

fs_mgr/libsnapshot/snapuserd_server.h

@@ -28,7 +28,7 @@
 #include <vector>
 
 #include <android-base/unique_fd.h>
-#include <libsnapshot/snapuserd.h>
+#include "snapuserd.h"
 
 namespace android {
 namespace snapshot {