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

Commit 44d884b4 authored by Erik Kline's avatar Erik Kline Committed by android-build-merger
Browse files

Use explicit path for /vendor/xbin/wlutil 

am: 0816520c

* commit '0816520c':
  Use explicit path for /vendor/xbin/wlutil

Change-Id: I1122b59ba30a870b823c51796c758df6e8883b91
parents a623d136 0816520c

cmds/dumpstate/dumpstate.cpp

+6 −5
Original line number Original line Diff line number Diff line
@@ -77,6 +77,7 @@ static std::string suffix; 
/* Can accomodate a tombstone number up to 9999. */

/* Can accomodate a tombstone number up to 9999. */

#define TOMBSTONE_MAX_LEN (sizeof(TOMBSTONE_FILE_PREFIX) + 4)

#define TOMBSTONE_MAX_LEN (sizeof(TOMBSTONE_FILE_PREFIX) + 4)

#define NUM_TOMBSTONES  10

#define NUM_TOMBSTONES  10

#define WLUTIL "/vendor/xbin/wlutil"





typedef struct {

typedef struct {

  char name[TOMBSTONE_MAX_LEN];

  char name[TOMBSTONE_MAX_LEN];
@@ -813,13 +814,13 @@ static void dumpstate(const std::string& screenshot_path, const std::string& ver 




#ifdef FWDUMP_bcmdhd

#ifdef FWDUMP_bcmdhd

    run_command("ND OFFLOAD TABLE", 5,

    run_command("ND OFFLOAD TABLE", 5,

            SU_PATH, "root", "wlutil", "nd_hostip", NULL);

            SU_PATH, "root", WLUTIL, "nd_hostip", NULL);





    run_command("DUMP WIFI INTERNAL COUNTERS (1)", 20,

    run_command("DUMP WIFI INTERNAL COUNTERS (1)", 20,

            SU_PATH, "root", "wlutil", "counters", NULL);

            SU_PATH, "root", WLUTIL, "counters", NULL);





    run_command("ND OFFLOAD STATUS (1)", 5,

    run_command("ND OFFLOAD STATUS (1)", 5,

            SU_PATH, "root", "wlutil", "nd_status", NULL);

            SU_PATH, "root", WLUTIL, "nd_status", NULL);





#endif

#endif

    dump_file("INTERRUPTS (1)", "/proc/interrupts");

    dump_file("INTERRUPTS (1)", "/proc/interrupts");
@@ -831,10 +832,10 @@ static void dumpstate(const std::string& screenshot_path, const std::string& ver 
            SU_PATH, "root", "dhdutil", "-i", "wlan0", "dump", NULL);

            SU_PATH, "root", "dhdutil", "-i", "wlan0", "dump", NULL);





    run_command("DUMP WIFI INTERNAL COUNTERS (2)", 20,

    run_command("DUMP WIFI INTERNAL COUNTERS (2)", 20,

            SU_PATH, "root", "wlutil", "counters", NULL);

            SU_PATH, "root", WLUTIL, "counters", NULL);





    run_command("ND OFFLOAD STATUS (2)", 5,

    run_command("ND OFFLOAD STATUS (2)", 5,

            SU_PATH, "root", "wlutil", "nd_status", NULL);

            SU_PATH, "root", WLUTIL, "nd_status", NULL);

#endif

#endif

    dump_file("INTERRUPTS (2)", "/proc/interrupts");

    dump_file("INTERRUPTS (2)", "/proc/interrupts");