PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 06689dc5: Merge "Fix recovery image build."

Browse Source 
* commit '06689dc53d14ab0449c64c097d2937179f986873':
  Fix recovery image build.
This commit is contained in:
Elliott Hughes
2015-08-07 20:29:52 +00:00
committed by Android Git Automerger
parent 393d1e739f 06689dc53d
commit a9390df6c6
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
minadbd/adb_main.cpp
+1 -1
View File
@@ -27,7 +27,7 @@
#include "adb_auth.h" #include "adb_auth.h"
#include "transport.h" #include "transport.h"
int adb_main(int is_daemon, int server_port) { int adb_main(int is_daemon, int server_port, int /* reply_fd */) {
adb_device_banner = "sideload"; adb_device_banner = "sideload";
signal(SIGPIPE, SIG_IGN); signal(SIGPIPE, SIG_IGN);
recovery.cpp
+1 -1
View File
@@ -942,7 +942,7 @@ main(int argc, char **argv) {
// only way recovery should be run with this argument is when it // only way recovery should be run with this argument is when it
// starts a copy of itself from the apply_from_adb() function. // starts a copy of itself from the apply_from_adb() function.
if (argc == 2 && strcmp(argv[1], "--adbd") == 0) { if (argc == 2 && strcmp(argv[1], "--adbd") == 0) {
adb_main(0, DEFAULT_ADB_PORT); adb_main(0, DEFAULT_ADB_PORT, -1);
return 0; return 0;
} }