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

Commit edec033b authored by Josh Gao's avatar Josh Gao
Browse files

adb: split file_sync_service.h into client and daemon parts. 

Test: treehugger
Change-Id: I648c7001903a91448c69986e08a6cd2dd76ed793
parent 220c1d55

adb/client/bugreport.cpp

+2 −1
Original line number Diff line number Diff line
@@ -25,8 +25,9 @@ 
#include <android-base/strings.h>



#include "sysdeps.h"



#include "adb_utils.h"

#include "file_sync_service.h"

#include "client/file_sync_client.h"



static constexpr char BUGZ_BEGIN_PREFIX[] = "BEGIN:";

static constexpr char BUGZ_PROGRESS_PREFIX[] = "PROGRESS:";

adb/client/commandline.cpp

+1 −1
Original line number Diff line number Diff line
@@ -56,8 +56,8 @@ 
#include "adb_unique_fd.h"

#include "adb_utils.h"

#include "bugreport.h"

#include "client/file_sync_client.h"

#include "commandline.h"

#include "file_sync_service.h"

#include "services.h"

#include "shell_service.h"

#include "sysdeps/chrono.h"

adb/client/file_sync_client.cpp

+3 −1
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ 
 * limitations under the License.

 */



#include "client/file_sync_client.h"



#include <dirent.h>

#include <inttypes.h>

#include <limits.h>
@@ -39,7 +41,7 @@ 
#include "adb_client.h"

#include "adb_io.h"

#include "adb_utils.h"

#include "file_sync_service.h"

#include "file_sync_protocol.h"

#include "line_printer.h"

#include "sysdeps/errno.h"

#include "sysdeps/stat.h"

adb/client/file_sync_client.h

0 → 100644
+27 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2018 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#pragma once



#include <string>

#include <vector>



bool do_sync_ls(const char* path);

bool do_sync_push(const std::vector<const char*>& srcs, const char* dst, bool sync);

bool do_sync_pull(const std::vector<const char*>& srcs, const char* dst, bool copy_attrs,

                  const char* name = nullptr);



bool do_sync_sync(const std::string& lpath, const std::string& rpath, bool list_only);

adb/daemon/file_sync_service.cpp

+3 −1
Original line number Diff line number Diff line
@@ -16,8 +16,9 @@ 


#define TRACE_TAG SYNC



#include "daemon/file_sync_service.h"



#include "sysdeps.h"

#include "file_sync_service.h"



#include <dirent.h>

#include <errno.h>
@@ -42,6 +43,7 @@ 
#include "adb_io.h"

#include "adb_trace.h"

#include "adb_utils.h"

#include "file_sync_protocol.h"

#include "security_log_tags.h"

#include "sysdeps/errno.h"