diff options
| author | Elliott Hughes <enh@google.com> | 2015-03-13 17:03:32 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-13 17:03:32 +0000 |
| commit | 7f0564bab89da86886bbd82ecea84acd409ba0d9 (patch) | |
| tree | 129ae8b263bbfeb7aedc43199c5dbef3b356c2bf | |
| parent | dc5f1db8e05df56c087fef0c90e876c94bb62b73 (diff) | |
| parent | 48f25fa974b6ac620d62a54764294acb4aed10a3 (diff) | |
| download | system_core-7f0564bab89da86886bbd82ecea84acd409ba0d9.zip system_core-7f0564bab89da86886bbd82ecea84acd409ba0d9.tar.gz system_core-7f0564bab89da86886bbd82ecea84acd409ba0d9.tar.bz2 | |
am 48f25fa9: Merge "adb doesn\'t actually use libzipfile."
* commit '48f25fa974b6ac620d62a54764294acb4aed10a3':
adb doesn't actually use libzipfile.
| -rw-r--r-- | adb/Android.mk | 1 | ||||
| -rw-r--r-- | adb/adb_client.cpp | 1 | ||||
| -rw-r--r-- | adb/file_sync_client.cpp | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/adb/Android.mk b/adb/Android.mk index 1749c62..8171611 100644 --- a/adb/Android.mk +++ b/adb/Android.mk @@ -155,7 +155,6 @@ LOCAL_MODULE_TAGS := debug LOCAL_STATIC_LIBRARIES := \ libadb \ - libzipfile \ libcrypto_static \ $(EXTRA_STATIC_LIBS) \ diff --git a/adb/adb_client.cpp b/adb/adb_client.cpp index d677db8..a485aa2 100644 --- a/adb/adb_client.cpp +++ b/adb/adb_client.cpp @@ -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; diff --git a/adb/file_sync_client.cpp b/adb/file_sync_client.cpp index 8ce4ee2..4ba730b 100644 --- a/adb/file_sync_client.cpp +++ b/adb/file_sync_client.cpp @@ -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; |