diff options
author | Josh Gao <jmgao@google.com> | 2016-08-30 22:33:07 +0200 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-08-30 22:33:07 +0200 |
commit | 1d873510ff7ab9a09b807e96ac913a01bd190831 (patch) | |
tree | aaa72a39896369993806e5bf82c76d84db92e1d2 /minadbd | |
parent | Merge "Fix clang-tidy warnings in bootable/recovery." am: 89bf2bdc85 am: 9968866e86 (diff) | |
parent | Merge "minadbd: rename adb_server_main to minadbd_main." am: 818394869d (diff) | |
download | android_bootable_recovery-1d873510ff7ab9a09b807e96ac913a01bd190831.tar android_bootable_recovery-1d873510ff7ab9a09b807e96ac913a01bd190831.tar.gz android_bootable_recovery-1d873510ff7ab9a09b807e96ac913a01bd190831.tar.bz2 android_bootable_recovery-1d873510ff7ab9a09b807e96ac913a01bd190831.tar.lz android_bootable_recovery-1d873510ff7ab9a09b807e96ac913a01bd190831.tar.xz android_bootable_recovery-1d873510ff7ab9a09b807e96ac913a01bd190831.tar.zst android_bootable_recovery-1d873510ff7ab9a09b807e96ac913a01bd190831.zip |
Diffstat (limited to 'minadbd')
-rw-r--r-- | minadbd/Android.mk | 2 | ||||
-rw-r--r-- | minadbd/minadbd.cpp (renamed from minadbd/adb_main.cpp) | 4 | ||||
-rw-r--r-- | minadbd/minadbd.h | 22 |
3 files changed, 26 insertions, 2 deletions
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/minadbd.cpp index 8e581c2a9..349189cc7 100644 --- a/minadbd/adb_main.cpp +++ b/minadbd/minadbd.cpp @@ -14,6 +14,8 @@ * limitations under the License. */ +#include "minadbd.h" + #include <errno.h> #include <signal.h> #include <stdio.h> @@ -23,7 +25,7 @@ #include "adb_auth.h" #include "transport.h" -int adb_server_main(int is_daemon, int server_port, int /* reply_fd */) { +int minadbd_main() { adb_device_banner = "sideload"; signal(SIGPIPE, SIG_IGN); 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 |