Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8fa0007a authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

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

* commit 'a9390df6':
  Fix recovery image build.
parents 7daa48e6 a9390df6

minadbd/adb_main.cpp

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#include "adb_auth.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";



    signal(SIGPIPE, SIG_IGN);

recovery.cpp

+1 −1
Original line number Diff line number Diff line
@@ -942,7 +942,7 @@ 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_main(0, DEFAULT_ADB_PORT);

        adb_main(0, DEFAULT_ADB_PORT, -1);

        return 0;

    }