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

Commit 4acabfee authored by Stephen Hines's avatar Stephen Hines Committed by Android Git Automerger
Browse files

am 64f44b84: Merge "Remove obsolete reference to ddk; Fixes for -Werror" into lmp-dev 

* commit '64f44b84':
  Remove obsolete reference to ddk; Fixes for -Werror
parents 3684c836 64f44b84

adb/Android.mk

+1 −3
Original line number Diff line number Diff line
@@ -39,13 +39,11 @@ ifeq ($(HOST_OS),windows) 
  ifneq ($(strip $(USE_CYGWIN)),)

    # Pure cygwin case

    LOCAL_LDLIBS += -lpthread -lgdi32

    LOCAL_C_INCLUDES += /usr/include/w32api/ddk

  endif

  ifneq ($(strip $(USE_MINGW)),)

    # MinGW under Linux case

    LOCAL_LDLIBS += -lws2_32 -lgdi32

    USE_SYSDEPS_WIN32 := 1

    LOCAL_C_INCLUDES += /usr/i586-mingw32msvc/include/ddk

  endif

  LOCAL_C_INCLUDES += development/host/windows/usb/api/

endif
@@ -74,7 +72,7 @@ else 
  LOCAL_SRC_FILES += fdevent.c

endif



LOCAL_CFLAGS += -O2 -g -DADB_HOST=1 -Wall -Wno-unused-parameter -Werror

LOCAL_CFLAGS += -O2 -g -DADB_HOST=1 -Wall -Wno-unused-parameter -Wno-error=cpp -Werror

LOCAL_CFLAGS += -D_XOPEN_SOURCE -D_GNU_SOURCE

LOCAL_MODULE := adb

LOCAL_MODULE_TAGS := debug

adb/commandline.c

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
 */



#include <stdio.h>

#include <stdint.h>

#include <stdlib.h>

#include <string.h>

#include <errno.h>

adb/sysdeps.h

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include <sys/stat.h>

#include <errno.h>

#include <ctype.h>

#include <direct.h>



#define OS_PATH_SEPARATOR '\\'

#define OS_PATH_SEPARATOR_STR "\\"

adb/sysdeps_win32.c

+1 −1
Original line number Diff line number Diff line
@@ -1549,7 +1549,7 @@ _wait_for_all(HANDLE* handles, int handles_count) 
     * reset" event that will remain set once it was set. */

    main_event = CreateEvent(NULL, TRUE, FALSE, NULL);

    if (main_event == NULL) {

        D("Unable to create main event. Error: %d", GetLastError());

        D("Unable to create main event. Error: %d", (int)GetLastError());

        free(threads);

        return (int)WAIT_FAILED;

    }

fastboot/Android.mk

+0 −2
Original line number Diff line number Diff line
@@ -40,13 +40,11 @@ ifeq ($(HOST_OS),windows) 
  ifneq ($(strip $(USE_CYGWIN)),)

    # Pure cygwin case

    LOCAL_LDLIBS += -lpthread

    LOCAL_C_INCLUDES += /usr/include/w32api/ddk

  endif

  ifneq ($(strip $(USE_MINGW)),)

    # MinGW under Linux case

    LOCAL_LDLIBS += -lws2_32

    USE_SYSDEPS_WIN32 := 1

    LOCAL_C_INCLUDES += /usr/i586-mingw32msvc/include/ddk

  endif

  LOCAL_C_INCLUDES += development/host/windows/usb/api

endif