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

Commit 51248395 authored by Elliott Hughes's avatar Elliott Hughes Committed by Gerrit Code Review
Browse files

Merge "Clean up adb/Android.mk"

parents 3f5bba53 b79a2d55

adb/Android.mk

+2 −6
Original line number Diff line number Diff line
@@ -64,8 +64,6 @@ LOCAL_SRC_FILES := \ 
	$(EXTRA_SRCS) \

	$(USB_SRCS) \



LOCAL_C_INCLUDES += external/openssl/include



ifneq ($(USE_SYSDEPS_WIN32),)

  LOCAL_SRC_FILES += sysdeps_win32.c

else
@@ -77,7 +75,7 @@ LOCAL_CFLAGS += -D_XOPEN_SOURCE -D_GNU_SOURCE 
LOCAL_MODULE := adb

LOCAL_MODULE_TAGS := debug



LOCAL_STATIC_LIBRARIES := libzipfile libunz libcrypto_static $(EXTRA_STATIC_LIBS)

LOCAL_STATIC_LIBRARIES := libzipfile libz libcrypto_static $(EXTRA_STATIC_LIBS)

ifeq ($(USE_SYSDEPS_WIN32),)

	LOCAL_STATIC_LIBRARIES += libcutils

endif
@@ -167,11 +165,9 @@ LOCAL_CFLAGS := \ 
	-D_XOPEN_SOURCE \

	-D_GNU_SOURCE



LOCAL_C_INCLUDES += external/openssl/include



LOCAL_MODULE := adb



LOCAL_STATIC_LIBRARIES := libzipfile libunz libcutils liblog

LOCAL_STATIC_LIBRARIES := libzipfile libz libcutils liblog



LOCAL_SHARED_LIBRARIES := libcrypto