diff options
author | Haibo Huang <hhb@google.com> | 2018-08-27 13:26:20 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-08-27 13:26:20 -0700 |
commit | 528538d98605d90b2a1c898429554f0ae50f810a (patch) | |
tree | 6b722512d3120a816c9fd6677dcfd83d09dad22b /applier/src | |
parent | 68de7031a8bb372d6dea3a2f40e782e8c157186c (diff) | |
parent | 8b11a458e437c06ef5d51f49e7492c1457d31e62 (diff) | |
download | archive-patcher-528538d98605d90b2a1c898429554f0ae50f810a.tar.gz |
Upgrade archive-patcher to 1.0
am: 8b11a458e4
Change-Id: Ibee6bff6abad106fe5219a68cf788201a0900de4
Diffstat (limited to 'applier/src')
-rw-r--r-- | applier/src/main/java/com/google/archivepatcher/applier/FileByFileV1DeltaApplier.java | 16 | ||||
-rw-r--r-- | applier/src/test/resources/com/google/archivepatcher/applier/bsdiff/testdata/bsdifftest_internal_blob_a.bin (renamed from applier/src/test/java/com/google/archivepatcher/applier/bsdiff/testdata/bsdifftest_internal_blob_a.bin) | 0 | ||||
-rw-r--r-- | applier/src/test/resources/com/google/archivepatcher/applier/bsdiff/testdata/bsdifftest_internal_blob_b.bin (renamed from applier/src/test/java/com/google/archivepatcher/applier/bsdiff/testdata/bsdifftest_internal_blob_b.bin) | 0 | ||||
-rw-r--r-- | applier/src/test/resources/com/google/archivepatcher/applier/bsdiff/testdata/bsdifftest_internal_patch_a_to_b.bin (renamed from applier/src/test/java/com/google/archivepatcher/applier/bsdiff/testdata/bsdifftest_internal_patch_a_to_b.bin) | bin | 474 -> 474 bytes | |||
-rw-r--r-- | applier/src/test/resources/com/google/archivepatcher/applier/bsdiff/testdata/bsdifftest_minimal_blob_a.bin (renamed from applier/src/test/java/com/google/archivepatcher/applier/bsdiff/testdata/bsdifftest_minimal_blob_a.bin) | bin | 8508 -> 8508 bytes | |||
-rw-r--r-- | applier/src/test/resources/com/google/archivepatcher/applier/bsdiff/testdata/bsdifftest_minimal_blob_b.bin (renamed from applier/src/test/java/com/google/archivepatcher/applier/bsdiff/testdata/bsdifftest_minimal_blob_b.bin) | bin | 8538 -> 8538 bytes | |||
-rw-r--r-- | applier/src/test/resources/com/google/archivepatcher/applier/bsdiff/testdata/bsdifftest_minimal_patch_a_to_b.bin (renamed from applier/src/test/java/com/google/archivepatcher/applier/bsdiff/testdata/bsdifftest_minimal_patch_a_to_b.bin) | bin | 8682 -> 8682 bytes | |||
-rw-r--r-- | applier/src/test/resources/com/google/archivepatcher/applier/bsdiff/testdata/bsdifftest_partial_a.txt (renamed from applier/src/test/java/com/google/archivepatcher/applier/bsdiff/testdata/bsdifftest_partial_a.txt) | 0 | ||||
-rw-r--r-- | applier/src/test/resources/com/google/archivepatcher/applier/bsdiff/testdata/bsdifftest_partial_b.bin (renamed from applier/src/test/java/com/google/archivepatcher/applier/bsdiff/testdata/bsdifftest_partial_b.bin) | 0 |
9 files changed, 14 insertions, 2 deletions
diff --git a/applier/src/main/java/com/google/archivepatcher/applier/FileByFileV1DeltaApplier.java b/applier/src/main/java/com/google/archivepatcher/applier/FileByFileV1DeltaApplier.java index d0a578b..8ed25fe 100644 --- a/applier/src/main/java/com/google/archivepatcher/applier/FileByFileV1DeltaApplier.java +++ b/applier/src/main/java/com/google/archivepatcher/applier/FileByFileV1DeltaApplier.java @@ -17,7 +17,6 @@ package com.google.archivepatcher.applier; import com.google.archivepatcher.applier.bsdiff.BsDiffDeltaApplier; import com.google.archivepatcher.shared.DeltaFriendlyFile; import com.google.archivepatcher.shared.RandomAccessFileOutputStream; - import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -39,11 +38,24 @@ public class FileByFileV1DeltaApplier implements DeltaApplier { private final File tempDir; /** + * Creates a new delta applier that will use the default temp directory for working files. This is + * equivalent to calling {@link #FileByFileV1DeltaApplier(File)} with a <code>null</code> file + * argument. + */ + public FileByFileV1DeltaApplier() { + this(null); + } + + /** * Creates a new delta applier that will use the specified temp directory. + * * @param tempDir a temp directory where the delta-friendly old blob can be written during the - * patch application process + * patch application process; if null, the system's default temporary directory is used */ public FileByFileV1DeltaApplier(File tempDir) { + if (tempDir == null) { + tempDir = new File(System.getProperty("java.io.tmpdir")); + } this.tempDir = tempDir; } diff --git a/applier/src/test/java/com/google/archivepatcher/applier/bsdiff/testdata/bsdifftest_internal_blob_a.bin b/applier/src/test/resources/com/google/archivepatcher/applier/bsdiff/testdata/bsdifftest_internal_blob_a.bin index 59b313b..59b313b 100644 --- a/applier/src/test/java/com/google/archivepatcher/applier/bsdiff/testdata/bsdifftest_internal_blob_a.bin +++ b/applier/src/test/resources/com/google/archivepatcher/applier/bsdiff/testdata/bsdifftest_internal_blob_a.bin diff --git a/applier/src/test/java/com/google/archivepatcher/applier/bsdiff/testdata/bsdifftest_internal_blob_b.bin b/applier/src/test/resources/com/google/archivepatcher/applier/bsdiff/testdata/bsdifftest_internal_blob_b.bin index f13df60..f13df60 100644 --- a/applier/src/test/java/com/google/archivepatcher/applier/bsdiff/testdata/bsdifftest_internal_blob_b.bin +++ b/applier/src/test/resources/com/google/archivepatcher/applier/bsdiff/testdata/bsdifftest_internal_blob_b.bin diff --git a/applier/src/test/java/com/google/archivepatcher/applier/bsdiff/testdata/bsdifftest_internal_patch_a_to_b.bin b/applier/src/test/resources/com/google/archivepatcher/applier/bsdiff/testdata/bsdifftest_internal_patch_a_to_b.bin Binary files differindex 58fd870..58fd870 100644 --- a/applier/src/test/java/com/google/archivepatcher/applier/bsdiff/testdata/bsdifftest_internal_patch_a_to_b.bin +++ b/applier/src/test/resources/com/google/archivepatcher/applier/bsdiff/testdata/bsdifftest_internal_patch_a_to_b.bin diff --git a/applier/src/test/java/com/google/archivepatcher/applier/bsdiff/testdata/bsdifftest_minimal_blob_a.bin b/applier/src/test/resources/com/google/archivepatcher/applier/bsdiff/testdata/bsdifftest_minimal_blob_a.bin Binary files differindex ed66dcd..ed66dcd 100644 --- a/applier/src/test/java/com/google/archivepatcher/applier/bsdiff/testdata/bsdifftest_minimal_blob_a.bin +++ b/applier/src/test/resources/com/google/archivepatcher/applier/bsdiff/testdata/bsdifftest_minimal_blob_a.bin diff --git a/applier/src/test/java/com/google/archivepatcher/applier/bsdiff/testdata/bsdifftest_minimal_blob_b.bin b/applier/src/test/resources/com/google/archivepatcher/applier/bsdiff/testdata/bsdifftest_minimal_blob_b.bin Binary files differindex 4292b52..4292b52 100644 --- a/applier/src/test/java/com/google/archivepatcher/applier/bsdiff/testdata/bsdifftest_minimal_blob_b.bin +++ b/applier/src/test/resources/com/google/archivepatcher/applier/bsdiff/testdata/bsdifftest_minimal_blob_b.bin diff --git a/applier/src/test/java/com/google/archivepatcher/applier/bsdiff/testdata/bsdifftest_minimal_patch_a_to_b.bin b/applier/src/test/resources/com/google/archivepatcher/applier/bsdiff/testdata/bsdifftest_minimal_patch_a_to_b.bin Binary files differindex 5b0bc8b..5b0bc8b 100644 --- a/applier/src/test/java/com/google/archivepatcher/applier/bsdiff/testdata/bsdifftest_minimal_patch_a_to_b.bin +++ b/applier/src/test/resources/com/google/archivepatcher/applier/bsdiff/testdata/bsdifftest_minimal_patch_a_to_b.bin diff --git a/applier/src/test/java/com/google/archivepatcher/applier/bsdiff/testdata/bsdifftest_partial_a.txt b/applier/src/test/resources/com/google/archivepatcher/applier/bsdiff/testdata/bsdifftest_partial_a.txt index 2dee36b..2dee36b 100644 --- a/applier/src/test/java/com/google/archivepatcher/applier/bsdiff/testdata/bsdifftest_partial_a.txt +++ b/applier/src/test/resources/com/google/archivepatcher/applier/bsdiff/testdata/bsdifftest_partial_a.txt diff --git a/applier/src/test/java/com/google/archivepatcher/applier/bsdiff/testdata/bsdifftest_partial_b.bin b/applier/src/test/resources/com/google/archivepatcher/applier/bsdiff/testdata/bsdifftest_partial_b.bin index a2791f4..a2791f4 100644 --- a/applier/src/test/java/com/google/archivepatcher/applier/bsdiff/testdata/bsdifftest_partial_b.bin +++ b/applier/src/test/resources/com/google/archivepatcher/applier/bsdiff/testdata/bsdifftest_partial_b.bin |