PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use SuffixArrayIndexInterface opaque type instead of the underlying data pointer." am: 3d24b7bca6

Browse Source 
am: d8ecad7896

Change-Id: Ic6065205cca6bff453de6a6683ce82c2d314c7ac
This commit is contained in:
Alex Deymo
2017-10-24 17:32:01 +00:00
committed by android-build-merger
parent 404051ef0e d8ecad7896
commit 9d079c1254
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applypatch/imgdiff.cpp
+7 -5
View File
@@ -163,7 +163,7 @@
#include <android-base/stringprintf.h> #include <android-base/stringprintf.h>
#include <android-base/strings.h> #include <android-base/strings.h>
#include <android-base/unique_fd.h> #include <android-base/unique_fd.h>
#include <bsdiff.h> #include <bsdiff/bsdiff.h>
#include <ziparchive/zip_archive.h> #include <ziparchive/zip_archive.h>
#include <zlib.h> #include <zlib.h>
@@ -324,7 +324,8 @@ void ImageChunk::MergeAdjacentNormal(const ImageChunk& other) {
} }
bool ImageChunk::MakePatch(const ImageChunk& tgt, const ImageChunk& src, bool ImageChunk::MakePatch(const ImageChunk& tgt, const ImageChunk& src,
std::vector<uint8_t>* patch_data, saidx_t** bsdiff_cache) { std::vector<uint8_t>* patch_data,
bsdiff::SuffixArrayIndexInterface** bsdiff_cache) {
#if defined(__ANDROID__) #if defined(__ANDROID__)
char ptemp[] = "/data/local/tmp/imgdiff-patch-XXXXXX"; char ptemp[] = "/data/local/tmp/imgdiff-patch-XXXXXX";
#else #else
@@ -1083,7 +1084,7 @@ bool ZipModeImage::GeneratePatchesInternal(const ZipModeImage& tgt_image,
printf("Construct patches for %zu chunks...\n", tgt_image.NumOfChunks()); printf("Construct patches for %zu chunks...\n", tgt_image.NumOfChunks());
patch_chunks->clear(); patch_chunks->clear();
saidx_t* bsdiff_cache = nullptr; bsdiff::SuffixArrayIndexInterface* bsdiff_cache = nullptr;
for (size_t i = 0; i < tgt_image.NumOfChunks(); i++) { for (size_t i = 0; i < tgt_image.NumOfChunks(); i++) {
const auto& tgt_chunk = tgt_image[i]; const auto& tgt_chunk = tgt_image[i];
@@ -1097,7 +1098,8 @@ bool ZipModeImage::GeneratePatchesInternal(const ZipModeImage& tgt_image,
: src_image.FindChunkByName(tgt_chunk.GetEntryName()); : src_image.FindChunkByName(tgt_chunk.GetEntryName());
const auto& src_ref = (src_chunk == nullptr) ? src_image.PseudoSource() : *src_chunk; const auto& src_ref = (src_chunk == nullptr) ? src_image.PseudoSource() : *src_chunk;
saidx_t** bsdiff_cache_ptr = (src_chunk == nullptr) ? &bsdiff_cache : nullptr; bsdiff::SuffixArrayIndexInterface** bsdiff_cache_ptr =
(src_chunk == nullptr) ? &bsdiff_cache : nullptr;
std::vector<uint8_t> patch_data; std::vector<uint8_t> patch_data;
if (!ImageChunk::MakePatch(tgt_chunk, src_ref, &patch_data, bsdiff_cache_ptr)) { if (!ImageChunk::MakePatch(tgt_chunk, src_ref, &patch_data, bsdiff_cache_ptr)) {
@@ -1114,7 +1116,7 @@ bool ZipModeImage::GeneratePatchesInternal(const ZipModeImage& tgt_image,
patch_chunks->emplace_back(tgt_chunk, src_ref, std::move(patch_data)); patch_chunks->emplace_back(tgt_chunk, src_ref, std::move(patch_data));
} }
} }
free(bsdiff_cache); delete bsdiff_cache;
CHECK_EQ(patch_chunks->size(), tgt_image.NumOfChunks()); CHECK_EQ(patch_chunks->size(), tgt_image.NumOfChunks());
return true; return true;
applypatch/include/applypatch/imgdiff_image.h
+3 -2
View File
@@ -24,7 +24,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include <bsdiff.h> #include <bsdiff/bsdiff.h>
#include <ziparchive/zip_archive.h> #include <ziparchive/zip_archive.h>
#include <zlib.h> #include <zlib.h>
@@ -98,7 +98,8 @@ class ImageChunk {
* repeatedly, pass nullptr if not needed. * repeatedly, pass nullptr if not needed.
*/ */
static bool MakePatch(const ImageChunk& tgt, const ImageChunk& src, static bool MakePatch(const ImageChunk& tgt, const ImageChunk& src,
std::vector<uint8_t>* patch_data, saidx_t** bsdiff_cache); std::vector<uint8_t>* patch_data,
bsdiff::SuffixArrayIndexInterface** bsdiff_cache);
private: private:
const uint8_t* GetRawData() const; const uint8_t* GetRawData() const;
tests/component/updater_test.cpp
+1 -1
View File
@@ -33,7 +33,7 @@
#include <android-base/test_utils.h> #include <android-base/test_utils.h>
#include <bootloader_message/bootloader_message.h> #include <bootloader_message/bootloader_message.h>
#include <brotli/encode.h> #include <brotli/encode.h>
#include <bsdiff.h> #include <bsdiff/bsdiff.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include <ziparchive/zip_archive.h> #include <ziparchive/zip_archive.h>
#include <ziparchive/zip_writer.h> #include <ziparchive/zip_writer.h>