aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSen Jiang <senj@google.com>2019-01-09 17:01:14 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-01-09 17:01:14 -0800
commitc749c42f8d81b4ed90c47fa43d9850263045b04b (patch)
tree2bf778c4077346ecaf174e9849983566cea129a3
parent9535d0a2001b29dd7fa02626549e419ac18ebb44 (diff)
parent63bc20f6096f57ab8b8c596bacb850aacf967e11 (diff)
downloadpuffin-c749c42f8d81b4ed90c47fa43d9850263045b04b.tar.gz
Remove deprecated LocateDeflateSubBlocksInZipArchive(). am: b6577051c0
am: 63bc20f609 Change-Id: Icb1029af8b730c59ea351370d947a05d6968feb9
-rw-r--r--src/include/puffin/utils.h8
-rw-r--r--src/utils.cc5
2 files changed, 0 insertions, 13 deletions
diff --git a/src/include/puffin/utils.h b/src/include/puffin/utils.h
index 517d575..737454d 100644
--- a/src/include/puffin/utils.h
+++ b/src/include/puffin/utils.h
@@ -59,14 +59,6 @@ PUFFIN_EXPORT
bool LocateDeflatesInZipArchive(const Buffer& data,
std::vector<BitExtent>* deflates);
-// Create a list of deflate subblock locations from the deflate blocks in a
-// zip archive.
-// TODO(ahassani): Remove this function once update_engine starts to use
-// LocateDeflatesInZipArchive()
-PUFFIN_EXPORT
-bool LocateDeflateSubBlocksInZipArchive(const Buffer& data,
- std::vector<BitExtent>* deflates);
-
// Reads the deflates in from |deflates| and returns a list of its subblock
// locations. Each subblock in practice is a deflate stream by itself.
// Assumption is that the first subblock in each deflate in |deflates| start in
diff --git a/src/utils.cc b/src/utils.cc
index e77cf59..3ff4d64 100644
--- a/src/utils.cc
+++ b/src/utils.cc
@@ -310,11 +310,6 @@ bool LocateDeflatesInZipArchive(const Buffer& data,
return true;
}
-bool LocateDeflateSubBlocksInZipArchive(const Buffer& data,
- vector<BitExtent>* deflates) {
- return LocateDeflatesInZipArchive(data, deflates);
-}
-
bool FindPuffLocations(const UniqueStreamPtr& src,
const vector<BitExtent>& deflates,
vector<ByteExtent>* puffs,