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

Commit 49513cbc authored by Dan Albert's avatar Dan Albert
Browse files

Probably fix the Mac build. 

This was throwing an unused variable warning for kWorkaroundBug6558362
on Darwin.

Change-Id: I1cbf381708e9884180a37f3246af36795d07dfc2
parent a773632b

adb/client/main.cpp

+5 −6
Original line number Diff line number Diff line
@@ -42,9 +42,8 @@ static const bool kWorkaroundBug6558362 = true; 
static const bool kWorkaroundBug6558362 = false;

#endif



// We only build the affinity WAR code for Linux.

static void adb_workaround_affinity(void) {

#if defined(__linux__)

static void adb_set_affinity(void) {

    const char affinity_env[] = "ADB_CPU_AFFINITY_BUG6558362";

    const char* cpunum_str = getenv(affinity_env);

    if (cpunum_str == nullptr || *cpunum_str == '\0') {
@@ -68,8 +67,10 @@ static void adb_set_affinity(void) { 


    sched_getaffinity(0, sizeof(cpu_set), &cpu_set);

    D("new cpu_set[0]=0x%08lx\n", cpu_set.__bits[0]);

}

#else

    // No workaround was ever implemented for the other platforms.

#endif

}



#if defined(_WIN32)

static const char kNullFileName[] = "NUL";
@@ -135,11 +136,9 @@ int adb_main(int is_daemon, int server_port) { 


    init_transport_registration();



#if defined(__linux__)

    if (kWorkaroundBug6558362 && is_daemon) {

        adb_set_affinity();

        adb_workaround_affinity();

    }

#endif



    usb_init();

    local_init(DEFAULT_ADB_LOCAL_TRANSPORT_PORT);