am 7f0564ba: am 48f25fa9: Merge "adb doesn\'t actually use libzipfile."

* commit '7f0564bab89da86886bbd82ecea84acd409ba0d9':
  adb doesn't actually use libzipfile.
This commit is contained in:
Elliott Hughes 2015-03-13 17:09:13 +00:00 committed by Android Git Automerger
commit b5662f9323
3 changed files with 0 additions and 3 deletions

View File

@ -155,7 +155,6 @@ LOCAL_MODULE_TAGS := debug
LOCAL_STATIC_LIBRARIES := \
libadb \
libzipfile \
libcrypto_static \
$(EXTRA_STATIC_LIBS) \

View File

@ -28,7 +28,6 @@
#define TRACE_TAG TRACE_ADB
#include "adb_client.h"
#include "adb_io.h"
#include "zipfile/zipfile.h"
static transport_type __adb_transport = kTransportAny;
static const char* __adb_serial = NULL;

View File

@ -32,7 +32,6 @@
#include "adb_client.h"
#include "adb_io.h"
#include "file_sync_service.h"
#include "zipfile/zipfile.h"
static unsigned long long total_bytes;
static long long start_time;