Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62b3ac23 authored by David Anderson's avatar David Anderson Committed by Automerger Merge Worker
Browse files

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

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1527878

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6d14a06884c058a5ae1095ee10f593275e85aa3b
parents 5739706a 81e163fc

fs_mgr/libsnapshot/snapuserd.cpp

+2 −18
Original line number Diff line number Diff line
@@ -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

+20 −1
Original line number Diff line number Diff line
@@ -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/include/libsnapshot/snapuserd_daemon.h→fs_mgr/libsnapshot/snapuserd_daemon.h

+1 −1
Original line number Diff line number Diff line
@@ -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

+3 −2
Original line number Diff line number Diff line
@@ -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 {