commit 3b9e07485df8e74c57e5d526defe328a8de2ff20
author Trevor Drake <trevordrake.gerrit@gmail.com> Sun Dec 07 15:13:29 2014 +0000
committer Trevor Drake <trevordrake.gerrit@gmail.com> Sun Dec 07 15:13:29 2014 +0000
tree 7249fdc3b3d2a996bc372f506b00781f9382ae04
parent 8a588603ae2bc1f9a5940a5d8ed7969583afc1dd

Clean up adb/Android.mk

Removed redundant LOCAL_C_INCLUDES.
Switch from using libunz to libz

Change-Id: Ic90c582fa56453bbac09561158e73f240dd47503

Android.mk

diff --git a/Android.mk b/Android.mk
index 3cadee3..7136afb 100644
--- a/Android.mk
+++ b/Android.mk
@@ -64,8 +64,6 @@
 	$(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_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 @@
 	-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