summaryrefslogtreecommitdiffstats
path: root/minadbd/minadbd_services.cpp
diff options
context:
space:
mode:
authorTianjie Xu <xunchang@google.com>2019-04-24 02:23:24 +0200
committerandroid-build-merger <android-build-merger@google.com>2019-04-24 02:23:24 +0200
commite529ea49ee710076c18089b54f3d234c39448fc9 (patch)
treec436ed4c2243eefedfb67301784a71879516c9ed /minadbd/minadbd_services.cpp
parentMerge changes Ibdb7dd0b,Iafd3e846 am: 72e6e55e34 am: 05e295b755 (diff)
parentMerge "Add test for minadbd" am: c92f412b8d (diff)
downloadandroid_bootable_recovery-e529ea49ee710076c18089b54f3d234c39448fc9.tar
android_bootable_recovery-e529ea49ee710076c18089b54f3d234c39448fc9.tar.gz
android_bootable_recovery-e529ea49ee710076c18089b54f3d234c39448fc9.tar.bz2
android_bootable_recovery-e529ea49ee710076c18089b54f3d234c39448fc9.tar.lz
android_bootable_recovery-e529ea49ee710076c18089b54f3d234c39448fc9.tar.xz
android_bootable_recovery-e529ea49ee710076c18089b54f3d234c39448fc9.tar.zst
android_bootable_recovery-e529ea49ee710076c18089b54f3d234c39448fc9.zip
Diffstat (limited to 'minadbd/minadbd_services.cpp')
-rw-r--r--minadbd/minadbd_services.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/minadbd/minadbd_services.cpp b/minadbd/minadbd_services.cpp
index 136392a64..f6aff71f8 100644
--- a/minadbd/minadbd_services.cpp
+++ b/minadbd/minadbd_services.cpp
@@ -50,6 +50,7 @@
static int minadbd_socket = -1;
static bool rescue_mode = false;
+static std::string sideload_mount_point = FUSE_SIDELOAD_HOST_MOUNTPOINT;
void SetMinadbdSocketFd(int socket_fd) {
minadbd_socket = socket_fd;
@@ -59,6 +60,10 @@ void SetMinadbdRescueMode(bool rescue) {
rescue_mode = rescue;
}
+void SetSideloadMountPoint(const std::string& path) {
+ sideload_mount_point = path;
+}
+
static bool WriteCommandToFd(MinadbdCommands cmd, int fd) {
char message[kMinadbdMessageSize];
memcpy(message, kMinadbdCommandPrefix, strlen(kMinadbdStatusPrefix));
@@ -109,7 +114,8 @@ static MinadbdErrorCode RunAdbFuseSideload(int sfd, const std::string& args,
}
auto adb_data_reader = std::make_unique<FuseAdbDataProvider>(sfd, file_size, block_size);
- if (int result = run_fuse_sideload(std::move(adb_data_reader)); result != 0) {
+ if (int result = run_fuse_sideload(std::move(adb_data_reader), sideload_mount_point.c_str());
+ result != 0) {
LOG(ERROR) << "Failed to start fuse";
return kMinadbdFuseStartError;
}