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

Commit b5662f93 authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

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

* commit '7f0564ba':
  adb doesn't actually use libzipfile.
parents dbf4cbe4 7f0564ba

adb/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -155,7 +155,6 @@ LOCAL_MODULE_TAGS := debug 


LOCAL_STATIC_LIBRARIES := \

    libadb \

    libzipfile \

    libcrypto_static \

    $(EXTRA_STATIC_LIBS) \

adb/adb_client.cpp

+0 −1
Original line number Diff line number Diff line
@@ -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;

adb/file_sync_client.cpp

+0 −1
Original line number Diff line number Diff line
@@ -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;