tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

minadbd: rename adb_server_main to minadbd_main.

Browse source 
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
This commit is contained in:
Josh Gao 2016-08-26 18:24:34 -07:00
parent b3ddc0a4bf
commit acb2a2fa4c
4 changed files with 28 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
minadbd/Android.mk
View file

@ -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

4
minadbd/adb_main.cpp → minadbd/minadbd.cpp
View file

@ -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);

22
minadbd/minadbd.h Normal file
View file

@ -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

3
recovery.cpp
View file

@ -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;
}