From b79a2d55f7c514357da3486a1d72b3fe31661207 Mon Sep 17 00:00:00 2001 From: Trevor Drake Date: Sun, 7 Dec 2014 15:13:29 +0000 Subject: [PATCH] Clean up adb/Android.mk Removed redundant LOCAL_C_INCLUDES. Switch from using libunz to libz Change-Id: Ic90c582fa56453bbac09561158e73f240dd47503 --- adb/Android.mk | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/adb/Android.mk b/adb/Android.mk index 3cadee36d..7136afb78 100644 --- a/adb/Android.mk +++ b/adb/Android.mk @@ -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