From acb2a2fa4c415944a27539461ba3757f3edbb128 Mon Sep 17 00:00:00 2001 From: Josh Gao Date: Fri, 26 Aug 2016 18:24:34 -0700 Subject: minadbd: rename adb_server_main to minadbd_main. adb_server_main in adb refers to the adb server on the host, not adbd. Since there doesn't seem to be a good reason to reuse the declaration from adb's headers, give minadbd a main function of its own. Change-Id: I748f1a6822dc14c726cb73ef3b533c57a6615608 --- minadbd/Android.mk | 2 +- minadbd/adb_main.cpp | 41 ----------------------------------------- minadbd/minadbd.cpp | 43 +++++++++++++++++++++++++++++++++++++++++++ minadbd/minadbd.h | 22 ++++++++++++++++++++++ recovery.cpp | 3 ++- 5 files changed, 68 insertions(+), 43 deletions(-) delete mode 100644 minadbd/adb_main.cpp create mode 100644 minadbd/minadbd.cpp create mode 100644 minadbd/minadbd.h diff --git a/minadbd/Android.mk b/minadbd/Android.mk index 34631a944..7eef13ee0 100644 --- a/minadbd/Android.mk +++ b/minadbd/Android.mk @@ -11,8 +11,8 @@ minadbd_cflags := \ include $(CLEAR_VARS) LOCAL_SRC_FILES := \ - adb_main.cpp \ fuse_adb_provider.cpp \ + minadbd.cpp \ minadbd_services.cpp \ LOCAL_CLANG := true diff --git a/minadbd/adb_main.cpp b/minadbd/adb_main.cpp deleted file mode 100644 index 8e581c2a9..000000000 --- a/minadbd/adb_main.cpp +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (C) 2015 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. - */ - -#include -#include -#include -#include - -#include "adb.h" -#include "adb_auth.h" -#include "transport.h" - -int adb_server_main(int is_daemon, int server_port, int /* reply_fd */) { - adb_device_banner = "sideload"; - - signal(SIGPIPE, SIG_IGN); - - // We can't require authentication for sideloading. http://b/22025550. - auth_required = false; - - init_transport_registration(); - usb_init(); - - VLOG(ADB) << "Event loop starting"; - fdevent_loop(); - - return 0; -} diff --git a/minadbd/minadbd.cpp b/minadbd/minadbd.cpp new file mode 100644 index 000000000..349189cc7 --- /dev/null +++ b/minadbd/minadbd.cpp @@ -0,0 +1,43 @@ +/* + * Copyright (C) 2015 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. + */ + +#include "minadbd.h" + +#include +#include +#include +#include + +#include "adb.h" +#include "adb_auth.h" +#include "transport.h" + +int minadbd_main() { + adb_device_banner = "sideload"; + + signal(SIGPIPE, SIG_IGN); + + // We can't require authentication for sideloading. http://b/22025550. + auth_required = false; + + init_transport_registration(); + usb_init(); + + VLOG(ADB) << "Event loop starting"; + fdevent_loop(); + + return 0; +} diff --git a/minadbd/minadbd.h b/minadbd/minadbd.h new file mode 100644 index 000000000..3570a5da5 --- /dev/null +++ b/minadbd/minadbd.h @@ -0,0 +1,22 @@ +/* + * Copyright (C) 2016 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. + */ + +#ifndef MINADBD_H__ +#define MINADBD_H__ + +int minadbd_main(); + +#endif diff --git a/recovery.cpp b/recovery.cpp index 45a6fe90c..9fbdd8c66 100644 --- a/recovery.cpp +++ b/recovery.cpp @@ -61,6 +61,7 @@ #include "fuse_sdcard_provider.h" #include "fuse_sideload.h" #include "install.h" +#include "minadbd/minadbd.h" #include "minui/minui.h" #include "minzip/DirUtil.h" #include "roots.h" @@ -1389,7 +1390,7 @@ int main(int argc, char **argv) { // only way recovery should be run with this argument is when it // starts a copy of itself from the apply_from_adb() function. if (argc == 2 && strcmp(argv[1], "--adbd") == 0) { - adb_server_main(0, DEFAULT_ADB_PORT, -1); + minadbd_main(); return 0; } -- cgit v1.2.3