diff options
author | Paulo Casanova <pasc@google.com> | 2016-11-14 16:02:08 +0000 |
---|---|---|
committer | Paulo Casanova <pasc@google.com> | 2016-11-16 05:38:00 +0000 |
commit | 5a1ccbecca5fc359bf488e717db310d307c0c9fc (patch) | |
tree | b414a0e3428c16f5cb24b9bff8c89b9a792d8211 /src/main/java/com/android | |
parent | a5c71db7e08ae4e72804a64e470c6d4e816e2ee7 (diff) | |
download | apkzlib-5a1ccbecca5fc359bf488e717db310d307c0c9fc.tar.gz |
Renamed apkzlib packages.
Test: Included
Change-Id: I9cce74b77719003875deaa5a0056e35f2930429e
Diffstat (limited to 'src/main/java/com/android')
-rw-r--r-- | src/main/java/com/android/apkzlib/sign/DigestAlgorithm.java (renamed from src/main/java/com/android/builder/internal/packaging/sign/DigestAlgorithm.java) | 4 | ||||
-rw-r--r-- | src/main/java/com/android/apkzlib/sign/FullApkSignExtension.java (renamed from src/main/java/com/android/builder/internal/packaging/sign/FullApkSignExtension.java) | 21 | ||||
-rw-r--r-- | src/main/java/com/android/apkzlib/sign/ManifestGenerationExtension.java (renamed from src/main/java/com/android/builder/internal/packaging/sign/ManifestGenerationExtension.java) | 16 | ||||
-rw-r--r-- | src/main/java/com/android/apkzlib/sign/SignatureAlgorithm.java (renamed from src/main/java/com/android/builder/internal/packaging/sign/SignatureAlgorithm.java) | 4 | ||||
-rw-r--r-- | src/main/java/com/android/apkzlib/sign/SignatureExtension.java (renamed from src/main/java/com/android/builder/internal/packaging/sign/SignatureExtension.java) | 12 | ||||
-rw-r--r-- | src/main/java/com/android/apkzlib/sign/package-info.java (renamed from src/main/java/com/android/builder/internal/packaging/sign/package-info.java) | 10 | ||||
-rw-r--r-- | src/main/java/com/android/apkzlib/sign/v2/ApkSignerV2.java (renamed from src/main/java/com/android/builder/internal/packaging/sign/v2/ApkSignerV2.java) | 4 | ||||
-rw-r--r-- | src/main/java/com/android/apkzlib/sign/v2/ByteArrayDigestSource.java (renamed from src/main/java/com/android/builder/internal/packaging/sign/v2/ByteArrayDigestSource.java) | 2 | ||||
-rw-r--r-- | src/main/java/com/android/apkzlib/sign/v2/ContentDigestAlgorithm.java (renamed from src/main/java/com/android/builder/internal/packaging/sign/v2/ContentDigestAlgorithm.java) | 2 | ||||
-rw-r--r-- | src/main/java/com/android/apkzlib/sign/v2/DigestSource.java (renamed from src/main/java/com/android/builder/internal/packaging/sign/v2/DigestSource.java) | 2 | ||||
-rw-r--r-- | src/main/java/com/android/apkzlib/sign/v2/SignatureAlgorithm.java (renamed from src/main/java/com/android/builder/internal/packaging/sign/v2/SignatureAlgorithm.java) | 4 | ||||
-rw-r--r-- | src/main/java/com/android/apkzlib/sign/v2/ZFileDigestSource.java (renamed from src/main/java/com/android/builder/internal/packaging/sign/v2/ZFileDigestSource.java) | 4 | ||||
-rw-r--r-- | src/main/java/com/android/apkzlib/utils/ApkZLibPair.java (renamed from src/main/java/com/android/builder/utils/ApkZLibPair.java) | 2 | ||||
-rw-r--r-- | src/main/java/com/android/apkzlib/utils/CachedFileContents.java (renamed from src/main/java/com/android/builder/utils/CachedFileContents.java) | 2 | ||||
-rw-r--r-- | src/main/java/com/android/apkzlib/utils/CachedSupplier.java (renamed from src/main/java/com/android/builder/utils/CachedSupplier.java) | 2 | ||||
-rw-r--r-- | src/main/java/com/android/apkzlib/utils/IOExceptionConsumer.java (renamed from src/main/java/com/android/builder/utils/IOExceptionConsumer.java) | 2 | ||||
-rw-r--r-- | src/main/java/com/android/apkzlib/utils/IOExceptionFunction.java (renamed from src/main/java/com/android/builder/utils/IOExceptionFunction.java) | 4 | ||||
-rw-r--r-- | src/main/java/com/android/apkzlib/utils/IOExceptionRunnable.java (renamed from src/main/java/com/android/builder/utils/IOExceptionRunnable.java) | 4 | ||||
-rw-r--r-- | src/main/java/com/android/apkzlib/utils/IOExceptionWrapper.java (renamed from src/main/java/com/android/builder/utils/IOExceptionWrapper.java) | 2 | ||||
-rw-r--r-- | src/main/java/com/android/apkzlib/zfile/ApkCreator.java (renamed from src/main/java/com/android/builder/packaging/ApkCreator.java) | 2 | ||||
-rw-r--r-- | src/main/java/com/android/apkzlib/zfile/ApkCreatorFactory.java (renamed from src/main/java/com/android/builder/packaging/ApkCreatorFactory.java) | 2 | ||||
-rw-r--r-- | src/main/java/com/android/apkzlib/zfile/ApkZFileCreator.java (renamed from src/main/java/com/android/builder/internal/packaging/zfile/ApkZFileCreator.java) | 14 | ||||
-rw-r--r-- | src/main/java/com/android/apkzlib/zfile/ApkZFileCreatorFactory.java (renamed from src/main/java/com/android/builder/internal/packaging/zfile/ApkZFileCreatorFactory.java) | 6 | ||||
-rw-r--r-- | src/main/java/com/android/apkzlib/zfile/ManifestAttributes.java (renamed from src/main/java/com/android/builder/packaging/ManifestAttributes.java) | 2 | ||||
-rw-r--r-- | src/main/java/com/android/apkzlib/zfile/NativeLibrariesPackagingMode.java (renamed from src/main/java/com/android/builder/packaging/NativeLibrariesPackagingMode.java) | 2 | ||||
-rw-r--r-- | src/main/java/com/android/apkzlib/zfile/ZFiles.java (renamed from src/main/java/com/android/builder/internal/packaging/zfile/ZFiles.java) | 18 | ||||
-rw-r--r-- | src/main/java/com/android/apkzlib/zip/AlignmentRule.java (renamed from src/main/java/com/android/builder/internal/packaging/zip/AlignmentRule.java) | 2 | ||||
-rw-r--r-- | src/main/java/com/android/apkzlib/zip/AlignmentRules.java (renamed from src/main/java/com/android/builder/internal/packaging/zip/AlignmentRules.java) | 2 | ||||
-rw-r--r-- | src/main/java/com/android/apkzlib/zip/CentralDirectory.java (renamed from src/main/java/com/android/builder/internal/packaging/zip/CentralDirectory.java) | 6 | ||||
-rw-r--r-- | src/main/java/com/android/apkzlib/zip/CentralDirectoryHeader.java (renamed from src/main/java/com/android/builder/internal/packaging/zip/CentralDirectoryHeader.java) | 4 | ||||
-rw-r--r-- | src/main/java/com/android/apkzlib/zip/CentralDirectoryHeaderCompressInfo.java (renamed from src/main/java/com/android/builder/internal/packaging/zip/CentralDirectoryHeaderCompressInfo.java) | 2 | ||||
-rw-r--r-- | src/main/java/com/android/apkzlib/zip/CompressionMethod.java (renamed from src/main/java/com/android/builder/internal/packaging/zip/CompressionMethod.java) | 2 | ||||
-rw-r--r-- | src/main/java/com/android/apkzlib/zip/CompressionResult.java (renamed from src/main/java/com/android/builder/internal/packaging/zip/CompressionResult.java) | 4 | ||||
-rw-r--r-- | src/main/java/com/android/apkzlib/zip/Compressor.java (renamed from src/main/java/com/android/builder/internal/packaging/zip/Compressor.java) | 4 | ||||
-rw-r--r-- | src/main/java/com/android/apkzlib/zip/DataDescriptorType.java (renamed from src/main/java/com/android/builder/internal/packaging/zip/DataDescriptorType.java) | 2 | ||||
-rw-r--r-- | src/main/java/com/android/apkzlib/zip/EncodeUtils.java (renamed from src/main/java/com/android/builder/internal/packaging/zip/EncodeUtils.java) | 2 | ||||
-rw-r--r-- | src/main/java/com/android/apkzlib/zip/Eocd.java (renamed from src/main/java/com/android/builder/internal/packaging/zip/Eocd.java) | 4 | ||||
-rw-r--r-- | src/main/java/com/android/apkzlib/zip/ExtraField.java (renamed from src/main/java/com/android/builder/internal/packaging/zip/ExtraField.java) | 4 | ||||
-rw-r--r-- | src/main/java/com/android/apkzlib/zip/FileUseMap.java (renamed from src/main/java/com/android/builder/internal/packaging/zip/FileUseMap.java) | 2 | ||||
-rw-r--r-- | src/main/java/com/android/apkzlib/zip/FileUseMapEntry.java (renamed from src/main/java/com/android/builder/internal/packaging/zip/FileUseMapEntry.java) | 2 | ||||
-rw-r--r-- | src/main/java/com/android/apkzlib/zip/GPFlags.java (renamed from src/main/java/com/android/builder/internal/packaging/zip/GPFlags.java) | 2 | ||||
-rw-r--r-- | src/main/java/com/android/apkzlib/zip/InflaterByteSource.java (renamed from src/main/java/com/android/builder/internal/packaging/zip/InflaterByteSource.java) | 4 | ||||
-rw-r--r-- | src/main/java/com/android/apkzlib/zip/LazyDelegateByteSource.java (renamed from src/main/java/com/android/builder/internal/packaging/zip/LazyDelegateByteSource.java) | 4 | ||||
-rw-r--r-- | src/main/java/com/android/apkzlib/zip/ProcessedAndRawByteSources.java (renamed from src/main/java/com/android/builder/internal/packaging/zip/ProcessedAndRawByteSources.java) | 4 | ||||
-rw-r--r-- | src/main/java/com/android/apkzlib/zip/StoredEntry.java (renamed from src/main/java/com/android/builder/internal/packaging/zip/StoredEntry.java) | 6 | ||||
-rw-r--r-- | src/main/java/com/android/apkzlib/zip/StoredEntryType.java (renamed from src/main/java/com/android/builder/internal/packaging/zip/StoredEntryType.java) | 2 | ||||
-rw-r--r-- | src/main/java/com/android/apkzlib/zip/ZFile.java (renamed from src/main/java/com/android/builder/internal/packaging/zip/ZFile.java) | 18 | ||||
-rw-r--r-- | src/main/java/com/android/apkzlib/zip/ZFileExtension.java (renamed from src/main/java/com/android/builder/internal/packaging/zip/ZFileExtension.java) | 4 | ||||
-rw-r--r-- | src/main/java/com/android/apkzlib/zip/ZFileOptions.java (renamed from src/main/java/com/android/builder/internal/packaging/zip/ZFileOptions.java) | 6 | ||||
-rw-r--r-- | src/main/java/com/android/apkzlib/zip/ZipField.java (renamed from src/main/java/com/android/builder/internal/packaging/zip/ZipField.java) | 4 | ||||
-rw-r--r-- | src/main/java/com/android/apkzlib/zip/ZipFieldInvariant.java (renamed from src/main/java/com/android/builder/internal/packaging/zip/ZipFieldInvariant.java) | 2 | ||||
-rw-r--r-- | src/main/java/com/android/apkzlib/zip/ZipFieldInvariantMaxValue.java (renamed from src/main/java/com/android/builder/internal/packaging/zip/ZipFieldInvariantMaxValue.java) | 2 | ||||
-rw-r--r-- | src/main/java/com/android/apkzlib/zip/ZipFieldInvariantNonNegative.java (renamed from src/main/java/com/android/builder/internal/packaging/zip/ZipFieldInvariantNonNegative.java) | 2 | ||||
-rw-r--r-- | src/main/java/com/android/apkzlib/zip/ZipFileState.java (renamed from src/main/java/com/android/builder/internal/packaging/zip/ZipFileState.java) | 2 | ||||
-rw-r--r-- | src/main/java/com/android/apkzlib/zip/compress/BestAndDefaultDeflateExecutorCompressor.java (renamed from src/main/java/com/android/builder/internal/packaging/zip/compress/BestAndDefaultDeflateExecutorCompressor.java) | 8 | ||||
-rw-r--r-- | src/main/java/com/android/apkzlib/zip/compress/DeflateExecutionCompressor.java (renamed from src/main/java/com/android/builder/internal/packaging/zip/compress/DeflateExecutionCompressor.java) | 10 | ||||
-rw-r--r-- | src/main/java/com/android/apkzlib/zip/compress/ExecutorCompressor.java (renamed from src/main/java/com/android/builder/internal/packaging/zip/compress/ExecutorCompressor.java) | 8 | ||||
-rw-r--r-- | src/main/java/com/android/apkzlib/zip/utils/ByteTracker.java (renamed from src/main/java/com/android/builder/internal/packaging/zip/utils/ByteTracker.java) | 2 | ||||
-rw-r--r-- | src/main/java/com/android/apkzlib/zip/utils/CloseableByteSource.java (renamed from src/main/java/com/android/builder/internal/packaging/zip/utils/CloseableByteSource.java) | 2 | ||||
-rw-r--r-- | src/main/java/com/android/apkzlib/zip/utils/CloseableDelegateByteSource.java (renamed from src/main/java/com/android/builder/internal/packaging/zip/utils/CloseableDelegateByteSource.java) | 2 | ||||
-rw-r--r-- | src/main/java/com/android/apkzlib/zip/utils/LittleEndianUtils.java (renamed from src/main/java/com/android/builder/internal/packaging/zip/utils/LittleEndianUtils.java) | 4 | ||||
-rw-r--r-- | src/main/java/com/android/apkzlib/zip/utils/MsDosDateTimeUtils.java (renamed from src/main/java/com/android/builder/internal/packaging/zip/utils/MsDosDateTimeUtils.java) | 2 | ||||
-rw-r--r-- | src/main/java/com/android/apkzlib/zip/utils/RandomAccessFileUtils.java (renamed from src/main/java/com/android/builder/internal/packaging/zip/utils/RandomAccessFileUtils.java) | 2 |
63 files changed, 143 insertions, 150 deletions
diff --git a/src/main/java/com/android/builder/internal/packaging/sign/DigestAlgorithm.java b/src/main/java/com/android/apkzlib/sign/DigestAlgorithm.java index 13cbf6c..cf484b2 100644 --- a/src/main/java/com/android/builder/internal/packaging/sign/DigestAlgorithm.java +++ b/src/main/java/com/android/apkzlib/sign/DigestAlgorithm.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 The Android Open Source Project + * Copyright (C) 2016 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.builder.internal.packaging.sign; +package com.android.apkzlib.sign; import com.android.annotations.NonNull; diff --git a/src/main/java/com/android/builder/internal/packaging/sign/FullApkSignExtension.java b/src/main/java/com/android/apkzlib/sign/FullApkSignExtension.java index 8f9dd6a..c1b56a1 100644 --- a/src/main/java/com/android/builder/internal/packaging/sign/FullApkSignExtension.java +++ b/src/main/java/com/android/apkzlib/sign/FullApkSignExtension.java @@ -14,19 +14,18 @@ * limitations under the License. */ -package com.android.builder.internal.packaging.sign; +package com.android.apkzlib.sign; import com.android.annotations.NonNull; import com.android.annotations.Nullable; -import com.android.builder.internal.packaging.sign.v2.ApkSignerV2; -import com.android.builder.internal.packaging.sign.v2.ByteArrayDigestSource; -import com.android.builder.internal.packaging.sign.v2.DigestSource; -import com.android.builder.internal.packaging.sign.v2.SignatureAlgorithm; -import com.android.builder.internal.packaging.sign.v2.ZFileDigestSource; -import com.android.builder.internal.packaging.zip.StoredEntry; -import com.android.builder.internal.packaging.zip.ZFile; -import com.android.builder.internal.packaging.zip.ZFileExtension; -import com.android.builder.internal.utils.IOExceptionRunnable; +import com.android.apkzlib.sign.v2.ApkSignerV2; +import com.android.apkzlib.sign.v2.ByteArrayDigestSource; +import com.android.apkzlib.sign.v2.DigestSource; +import com.android.apkzlib.sign.v2.ZFileDigestSource; +import com.android.apkzlib.utils.IOExceptionRunnable; +import com.android.apkzlib.zip.StoredEntry; +import com.android.apkzlib.zip.ZFile; +import com.android.apkzlib.zip.ZFileExtension; import com.google.common.base.Preconditions; import com.google.common.base.Verify; import com.google.common.collect.ImmutableList; @@ -78,7 +77,7 @@ public class FullApkSignExtension { /** * APK Signature Scheme v2 algorithms to use for signing the APK. */ - private final List<SignatureAlgorithm> mV2SignatureAlgorithms; + private final List<com.android.apkzlib.sign.v2.SignatureAlgorithm> mV2SignatureAlgorithms; /** * {@code true} if the zip needs its signature to be updated. diff --git a/src/main/java/com/android/builder/internal/packaging/sign/ManifestGenerationExtension.java b/src/main/java/com/android/apkzlib/sign/ManifestGenerationExtension.java index 8db3d6c..3afd00a 100644 --- a/src/main/java/com/android/builder/internal/packaging/sign/ManifestGenerationExtension.java +++ b/src/main/java/com/android/apkzlib/sign/ManifestGenerationExtension.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 The Android Open Source Project + * Copyright (C) 2016 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,16 +14,16 @@ * limitations under the License. */ -package com.android.builder.internal.packaging.sign; +package com.android.apkzlib.sign; import com.android.annotations.NonNull; import com.android.annotations.Nullable; -import com.android.builder.internal.packaging.zip.StoredEntry; -import com.android.builder.internal.packaging.zip.ZFile; -import com.android.builder.internal.packaging.zip.ZFileExtension; -import com.android.builder.internal.utils.CachedSupplier; -import com.android.builder.internal.utils.IOExceptionRunnable; -import com.android.builder.packaging.ManifestAttributes; +import com.android.apkzlib.utils.CachedSupplier; +import com.android.apkzlib.utils.IOExceptionRunnable; +import com.android.apkzlib.zip.StoredEntry; +import com.android.apkzlib.zip.ZFile; +import com.android.apkzlib.zip.ZFileExtension; +import com.android.apkzlib.zfile.ManifestAttributes; import com.google.common.base.Preconditions; import com.google.common.base.Verify; import com.google.common.collect.Maps; diff --git a/src/main/java/com/android/builder/internal/packaging/sign/SignatureAlgorithm.java b/src/main/java/com/android/apkzlib/sign/SignatureAlgorithm.java index e171fa2..aaeefb5 100644 --- a/src/main/java/com/android/builder/internal/packaging/sign/SignatureAlgorithm.java +++ b/src/main/java/com/android/apkzlib/sign/SignatureAlgorithm.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 The Android Open Source Project + * Copyright (C) 2016 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.builder.internal.packaging.sign; +package com.android.apkzlib.sign; import com.android.annotations.NonNull; diff --git a/src/main/java/com/android/builder/internal/packaging/sign/SignatureExtension.java b/src/main/java/com/android/apkzlib/sign/SignatureExtension.java index b8d526b..9f2196f 100644 --- a/src/main/java/com/android/builder/internal/packaging/sign/SignatureExtension.java +++ b/src/main/java/com/android/apkzlib/sign/SignatureExtension.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 The Android Open Source Project + * Copyright (C) 2016 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.android.builder.internal.packaging.sign; +package com.android.apkzlib.sign; import com.android.annotations.NonNull; import com.android.annotations.Nullable; -import com.android.builder.internal.packaging.zip.StoredEntry; -import com.android.builder.internal.packaging.zip.ZFile; -import com.android.builder.internal.packaging.zip.ZFileExtension; -import com.android.builder.internal.utils.IOExceptionRunnable; +import com.android.apkzlib.utils.IOExceptionRunnable; +import com.android.apkzlib.zip.StoredEntry; +import com.android.apkzlib.zip.ZFile; +import com.android.apkzlib.zip.ZFileExtension; import com.google.common.base.Objects; import com.google.common.base.Preconditions; import com.google.common.collect.Sets; diff --git a/src/main/java/com/android/builder/internal/packaging/sign/package-info.java b/src/main/java/com/android/apkzlib/sign/package-info.java index e8bf6e1..bdcb02e 100644 --- a/src/main/java/com/android/builder/internal/packaging/sign/package-info.java +++ b/src/main/java/com/android/apkzlib/sign/package-info.java @@ -28,14 +28,14 @@ actual coordination between the two is complex. The {@code sign} package works b extensions with the {@code zip} package. These extensions are notified in changes made in the zip and will change the zip file itself. <p> -The {@link com.android.builder.internal.packaging.sign.ManifestGenerationExtension} extension will +The {@link com.android.apkzlib.sign.ManifestGenerationExtension} extension will ensure the zip has a manifest file and is, therefore, a valid jar. -The {@link com.android.builder.internal.packaging.sign.SignatureExtension} extension will +The {@link com.android.apkzlib.sign.SignatureExtension} extension will ensure the jar is signed. <p> The extension mechanism used is the one provided in the {@code zip} package (see -{@link com.android.builder.internal.packaging.zip.ZFile} -and {@link com.android.builder.internal.packaging.zip.ZFileExtension}. Building the zip and then +{@link com.android.apkzlib.zip.ZFile} +and {@link com.android.apkzlib.zip.ZFileExtension}. Building the zip and then operating the extensions is not done sequentially, as we don't want to build a zip and then sign it. We want to build a zip that is automatically signed. Extension are basically observers that register on the zip and are notified when things happen in the zip. They will then modify the zip @@ -153,4 +153,4 @@ Additionally, by adding/removing extensions we can configure what type of apk we </ul> So, by configuring which extensions to add, the package task can decide what type of apk we want. */ -package com.android.builder.internal.packaging.sign;
\ No newline at end of file +package com.android.apkzlib.sign;
\ No newline at end of file diff --git a/src/main/java/com/android/builder/internal/packaging/sign/v2/ApkSignerV2.java b/src/main/java/com/android/apkzlib/sign/v2/ApkSignerV2.java index 66b1518..659cca4 100644 --- a/src/main/java/com/android/builder/internal/packaging/sign/v2/ApkSignerV2.java +++ b/src/main/java/com/android/apkzlib/sign/v2/ApkSignerV2.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.android.builder.internal.packaging.sign.v2; +package com.android.apkzlib.sign.v2; import com.android.annotations.NonNull; -import com.android.builder.internal.utils.ApkZLibPair; +import com.android.apkzlib.utils.ApkZLibPair; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import com.google.common.collect.Maps; diff --git a/src/main/java/com/android/builder/internal/packaging/sign/v2/ByteArrayDigestSource.java b/src/main/java/com/android/apkzlib/sign/v2/ByteArrayDigestSource.java index 8aafa95..a8ac5fd 100644 --- a/src/main/java/com/android/builder/internal/packaging/sign/v2/ByteArrayDigestSource.java +++ b/src/main/java/com/android/apkzlib/sign/v2/ByteArrayDigestSource.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.builder.internal.packaging.sign.v2; +package com.android.apkzlib.sign.v2; import java.security.MessageDigest; diff --git a/src/main/java/com/android/builder/internal/packaging/sign/v2/ContentDigestAlgorithm.java b/src/main/java/com/android/apkzlib/sign/v2/ContentDigestAlgorithm.java index d17b3b2..46678e4 100644 --- a/src/main/java/com/android/builder/internal/packaging/sign/v2/ContentDigestAlgorithm.java +++ b/src/main/java/com/android/apkzlib/sign/v2/ContentDigestAlgorithm.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.builder.internal.packaging.sign.v2; +package com.android.apkzlib.sign.v2; /** * APK Signature Scheme v2 content digest algorithm. diff --git a/src/main/java/com/android/builder/internal/packaging/sign/v2/DigestSource.java b/src/main/java/com/android/apkzlib/sign/v2/DigestSource.java index b2afd2f..1887805 100644 --- a/src/main/java/com/android/builder/internal/packaging/sign/v2/DigestSource.java +++ b/src/main/java/com/android/apkzlib/sign/v2/DigestSource.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.builder.internal.packaging.sign.v2; +package com.android.apkzlib.sign.v2; import java.io.IOException; import java.security.MessageDigest; diff --git a/src/main/java/com/android/builder/internal/packaging/sign/v2/SignatureAlgorithm.java b/src/main/java/com/android/apkzlib/sign/v2/SignatureAlgorithm.java index bcd6652..b922d8a 100644 --- a/src/main/java/com/android/builder/internal/packaging/sign/v2/SignatureAlgorithm.java +++ b/src/main/java/com/android/apkzlib/sign/v2/SignatureAlgorithm.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.android.builder.internal.packaging.sign.v2; +package com.android.apkzlib.sign.v2; -import com.android.builder.internal.utils.ApkZLibPair; +import com.android.apkzlib.utils.ApkZLibPair; import java.security.spec.AlgorithmParameterSpec; import java.security.spec.MGF1ParameterSpec; import java.security.spec.PSSParameterSpec; diff --git a/src/main/java/com/android/builder/internal/packaging/sign/v2/ZFileDigestSource.java b/src/main/java/com/android/apkzlib/sign/v2/ZFileDigestSource.java index a211ba7..7513987 100644 --- a/src/main/java/com/android/builder/internal/packaging/sign/v2/ZFileDigestSource.java +++ b/src/main/java/com/android/apkzlib/sign/v2/ZFileDigestSource.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.android.builder.internal.packaging.sign.v2; +package com.android.apkzlib.sign.v2; import java.io.IOException; import java.security.MessageDigest; import com.android.annotations.NonNull; -import com.android.builder.internal.packaging.zip.ZFile; +import com.android.apkzlib.zip.ZFile; import com.google.common.base.Preconditions; /** diff --git a/src/main/java/com/android/builder/utils/ApkZLibPair.java b/src/main/java/com/android/apkzlib/utils/ApkZLibPair.java index 04c1ecf..8cf79ee 100644 --- a/src/main/java/com/android/builder/utils/ApkZLibPair.java +++ b/src/main/java/com/android/apkzlib/utils/ApkZLibPair.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.builder.internal.utils; +package com.android.apkzlib.utils; /** * Pair implementation to use with the {@code apkzlib} library. diff --git a/src/main/java/com/android/builder/utils/CachedFileContents.java b/src/main/java/com/android/apkzlib/utils/CachedFileContents.java index 4e75aa4..00446d5 100644 --- a/src/main/java/com/android/builder/utils/CachedFileContents.java +++ b/src/main/java/com/android/apkzlib/utils/CachedFileContents.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.builder.internal.utils; +package com.android.apkzlib.utils; import com.android.annotations.NonNull; import com.android.annotations.Nullable; diff --git a/src/main/java/com/android/builder/utils/CachedSupplier.java b/src/main/java/com/android/apkzlib/utils/CachedSupplier.java index ead563a..b8c9a53 100644 --- a/src/main/java/com/android/builder/utils/CachedSupplier.java +++ b/src/main/java/com/android/apkzlib/utils/CachedSupplier.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.builder.internal.utils; +package com.android.apkzlib.utils; import com.android.annotations.NonNull; diff --git a/src/main/java/com/android/builder/utils/IOExceptionConsumer.java b/src/main/java/com/android/apkzlib/utils/IOExceptionConsumer.java index 89b430b..11c03b7 100644 --- a/src/main/java/com/android/builder/utils/IOExceptionConsumer.java +++ b/src/main/java/com/android/apkzlib/utils/IOExceptionConsumer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.builder.internal.utils; +package com.android.apkzlib.utils; import com.android.annotations.NonNull; import com.android.annotations.Nullable; diff --git a/src/main/java/com/android/builder/utils/IOExceptionFunction.java b/src/main/java/com/android/apkzlib/utils/IOExceptionFunction.java index a13cc69..11460a2 100644 --- a/src/main/java/com/android/builder/utils/IOExceptionFunction.java +++ b/src/main/java/com/android/apkzlib/utils/IOExceptionFunction.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 The Android Open Source Project + * Copyright (C) 2016 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.builder.internal.utils; +package com.android.apkzlib.utils; import com.android.annotations.NonNull; import com.android.annotations.Nullable; diff --git a/src/main/java/com/android/builder/utils/IOExceptionRunnable.java b/src/main/java/com/android/apkzlib/utils/IOExceptionRunnable.java index 7dbcea3..f1b181a 100644 --- a/src/main/java/com/android/builder/utils/IOExceptionRunnable.java +++ b/src/main/java/com/android/apkzlib/utils/IOExceptionRunnable.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 The Android Open Source Project + * Copyright (C) 2016 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.builder.internal.utils; +package com.android.apkzlib.utils; import com.android.annotations.NonNull; import java.io.IOException; diff --git a/src/main/java/com/android/builder/utils/IOExceptionWrapper.java b/src/main/java/com/android/apkzlib/utils/IOExceptionWrapper.java index bb0423e..604a90f 100644 --- a/src/main/java/com/android/builder/utils/IOExceptionWrapper.java +++ b/src/main/java/com/android/apkzlib/utils/IOExceptionWrapper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.builder.internal.utils; +package com.android.apkzlib.utils; import com.android.annotations.NonNull; diff --git a/src/main/java/com/android/builder/packaging/ApkCreator.java b/src/main/java/com/android/apkzlib/zfile/ApkCreator.java index d62d730..10cac94 100644 --- a/src/main/java/com/android/builder/packaging/ApkCreator.java +++ b/src/main/java/com/android/apkzlib/zfile/ApkCreator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.builder.packaging; +package com.android.apkzlib.zfile; import com.android.annotations.NonNull; import com.android.annotations.Nullable; diff --git a/src/main/java/com/android/builder/packaging/ApkCreatorFactory.java b/src/main/java/com/android/apkzlib/zfile/ApkCreatorFactory.java index 3501c33..d4fcdf9 100644 --- a/src/main/java/com/android/builder/packaging/ApkCreatorFactory.java +++ b/src/main/java/com/android/apkzlib/zfile/ApkCreatorFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.builder.packaging; +package com.android.apkzlib.zfile; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/src/main/java/com/android/builder/internal/packaging/zfile/ApkZFileCreator.java b/src/main/java/com/android/apkzlib/zfile/ApkZFileCreator.java index b07e855..a21c297 100644 --- a/src/main/java/com/android/builder/internal/packaging/zfile/ApkZFileCreator.java +++ b/src/main/java/com/android/apkzlib/zfile/ApkZFileCreator.java @@ -14,17 +14,15 @@ * limitations under the License. */ -package com.android.builder.internal.packaging.zfile; +package com.android.apkzlib.zfile; import com.android.annotations.NonNull; import com.android.annotations.Nullable; -import com.android.builder.internal.packaging.zip.AlignmentRule; -import com.android.builder.internal.packaging.zip.AlignmentRules; -import com.android.builder.internal.packaging.zip.StoredEntry; -import com.android.builder.internal.packaging.zip.ZFile; -import com.android.builder.internal.packaging.zip.ZFileOptions; -import com.android.builder.packaging.ApkCreator; -import com.android.builder.packaging.ApkCreatorFactory; +import com.android.apkzlib.zip.AlignmentRule; +import com.android.apkzlib.zip.AlignmentRules; +import com.android.apkzlib.zip.StoredEntry; +import com.android.apkzlib.zip.ZFile; +import com.android.apkzlib.zip.ZFileOptions; import com.google.common.base.Preconditions; import com.google.common.io.Closer; import java.io.File; diff --git a/src/main/java/com/android/builder/internal/packaging/zfile/ApkZFileCreatorFactory.java b/src/main/java/com/android/apkzlib/zfile/ApkZFileCreatorFactory.java index feb8f25..aecbf68 100644 --- a/src/main/java/com/android/builder/internal/packaging/zfile/ApkZFileCreatorFactory.java +++ b/src/main/java/com/android/apkzlib/zfile/ApkZFileCreatorFactory.java @@ -14,12 +14,10 @@ * limitations under the License. */ -package com.android.builder.internal.packaging.zfile; +package com.android.apkzlib.zfile; import com.android.annotations.NonNull; -import com.android.builder.internal.packaging.zip.ZFileOptions; -import com.android.builder.packaging.ApkCreator; -import com.android.builder.packaging.ApkCreatorFactory; +import com.android.apkzlib.zip.ZFileOptions; import java.io.IOException; import java.io.UncheckedIOException; diff --git a/src/main/java/com/android/builder/packaging/ManifestAttributes.java b/src/main/java/com/android/apkzlib/zfile/ManifestAttributes.java index dc6bdf3..d8a7d2d 100644 --- a/src/main/java/com/android/builder/packaging/ManifestAttributes.java +++ b/src/main/java/com/android/apkzlib/zfile/ManifestAttributes.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.builder.packaging; +package com.android.apkzlib.zfile; /** * Java manifest attributes and some default values. diff --git a/src/main/java/com/android/builder/packaging/NativeLibrariesPackagingMode.java b/src/main/java/com/android/apkzlib/zfile/NativeLibrariesPackagingMode.java index df28ef5..8916abe 100644 --- a/src/main/java/com/android/builder/packaging/NativeLibrariesPackagingMode.java +++ b/src/main/java/com/android/apkzlib/zfile/NativeLibrariesPackagingMode.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.builder.packaging; +package com.android.apkzlib.zfile; /** * Describes how native libs should be packaged. diff --git a/src/main/java/com/android/builder/internal/packaging/zfile/ZFiles.java b/src/main/java/com/android/apkzlib/zfile/ZFiles.java index 39fb279..0c288ee 100644 --- a/src/main/java/com/android/builder/internal/packaging/zfile/ZFiles.java +++ b/src/main/java/com/android/apkzlib/zfile/ZFiles.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package com.android.builder.internal.packaging.zfile; +package com.android.apkzlib.zfile; import com.android.annotations.NonNull; import com.android.annotations.Nullable; -import com.android.builder.internal.packaging.sign.FullApkSignExtension; -import com.android.builder.internal.packaging.sign.ManifestGenerationExtension; -import com.android.builder.internal.packaging.sign.SignatureExtension; -import com.android.builder.internal.packaging.zip.AlignmentRule; -import com.android.builder.internal.packaging.zip.AlignmentRules; -import com.android.builder.internal.packaging.zip.StoredEntry; -import com.android.builder.internal.packaging.zip.ZFile; -import com.android.builder.internal.packaging.zip.ZFileOptions; +import com.android.apkzlib.sign.FullApkSignExtension; +import com.android.apkzlib.sign.ManifestGenerationExtension; +import com.android.apkzlib.sign.SignatureExtension; +import com.android.apkzlib.zip.AlignmentRule; +import com.android.apkzlib.zip.AlignmentRules; +import com.android.apkzlib.zip.StoredEntry; +import com.android.apkzlib.zip.ZFile; +import com.android.apkzlib.zip.ZFileOptions; import java.io.File; import java.io.IOException; diff --git a/src/main/java/com/android/builder/internal/packaging/zip/AlignmentRule.java b/src/main/java/com/android/apkzlib/zip/AlignmentRule.java index 5fcd0a6..5cfe732 100644 --- a/src/main/java/com/android/builder/internal/packaging/zip/AlignmentRule.java +++ b/src/main/java/com/android/apkzlib/zip/AlignmentRule.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.builder.internal.packaging.zip; +package com.android.apkzlib.zip; import com.android.annotations.NonNull; diff --git a/src/main/java/com/android/builder/internal/packaging/zip/AlignmentRules.java b/src/main/java/com/android/apkzlib/zip/AlignmentRules.java index 01e472f..519c3da 100644 --- a/src/main/java/com/android/builder/internal/packaging/zip/AlignmentRules.java +++ b/src/main/java/com/android/apkzlib/zip/AlignmentRules.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.builder.internal.packaging.zip; +package com.android.apkzlib.zip; import com.android.annotations.NonNull; import com.google.common.base.Preconditions; diff --git a/src/main/java/com/android/builder/internal/packaging/zip/CentralDirectory.java b/src/main/java/com/android/apkzlib/zip/CentralDirectory.java index 92392cf..53706b1 100644 --- a/src/main/java/com/android/builder/internal/packaging/zip/CentralDirectory.java +++ b/src/main/java/com/android/apkzlib/zip/CentralDirectory.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.android.builder.internal.packaging.zip; +package com.android.apkzlib.zip; import com.android.annotations.NonNull; -import com.android.builder.internal.utils.CachedSupplier; -import com.android.builder.internal.packaging.zip.utils.MsDosDateTimeUtils; +import com.android.apkzlib.utils.CachedSupplier; +import com.android.apkzlib.zip.utils.MsDosDateTimeUtils; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; diff --git a/src/main/java/com/android/builder/internal/packaging/zip/CentralDirectoryHeader.java b/src/main/java/com/android/apkzlib/zip/CentralDirectoryHeader.java index f846b9d..c6792d5 100644 --- a/src/main/java/com/android/builder/internal/packaging/zip/CentralDirectoryHeader.java +++ b/src/main/java/com/android/apkzlib/zip/CentralDirectoryHeader.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.android.builder.internal.packaging.zip; +package com.android.apkzlib.zip; import com.android.annotations.NonNull; -import com.android.builder.internal.packaging.zip.utils.MsDosDateTimeUtils; +import com.android.apkzlib.zip.utils.MsDosDateTimeUtils; import com.google.common.base.Verify; import java.io.IOException; diff --git a/src/main/java/com/android/builder/internal/packaging/zip/CentralDirectoryHeaderCompressInfo.java b/src/main/java/com/android/apkzlib/zip/CentralDirectoryHeaderCompressInfo.java index ada9f2b..c8453b5 100644 --- a/src/main/java/com/android/builder/internal/packaging/zip/CentralDirectoryHeaderCompressInfo.java +++ b/src/main/java/com/android/apkzlib/zip/CentralDirectoryHeaderCompressInfo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.builder.internal.packaging.zip; +package com.android.apkzlib.zip; import com.android.annotations.NonNull; diff --git a/src/main/java/com/android/builder/internal/packaging/zip/CompressionMethod.java b/src/main/java/com/android/apkzlib/zip/CompressionMethod.java index 9984d3e..5ac970f 100644 --- a/src/main/java/com/android/builder/internal/packaging/zip/CompressionMethod.java +++ b/src/main/java/com/android/apkzlib/zip/CompressionMethod.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.builder.internal.packaging.zip; +package com.android.apkzlib.zip; import com.android.annotations.Nullable; diff --git a/src/main/java/com/android/builder/internal/packaging/zip/CompressionResult.java b/src/main/java/com/android/apkzlib/zip/CompressionResult.java index ab9fc75..d182f28 100644 --- a/src/main/java/com/android/builder/internal/packaging/zip/CompressionResult.java +++ b/src/main/java/com/android/apkzlib/zip/CompressionResult.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.android.builder.internal.packaging.zip; +package com.android.apkzlib.zip; import com.android.annotations.NonNull; -import com.android.builder.internal.packaging.zip.utils.CloseableByteSource; +import com.android.apkzlib.zip.utils.CloseableByteSource; /** * Result of compressing data. diff --git a/src/main/java/com/android/builder/internal/packaging/zip/Compressor.java b/src/main/java/com/android/apkzlib/zip/Compressor.java index 8084e25..d94cdf9 100644 --- a/src/main/java/com/android/builder/internal/packaging/zip/Compressor.java +++ b/src/main/java/com/android/apkzlib/zip/Compressor.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.android.builder.internal.packaging.zip; +package com.android.apkzlib.zip; import com.android.annotations.NonNull; -import com.android.builder.internal.packaging.zip.utils.CloseableByteSource; +import com.android.apkzlib.zip.utils.CloseableByteSource; import com.google.common.util.concurrent.ListenableFuture; /** diff --git a/src/main/java/com/android/builder/internal/packaging/zip/DataDescriptorType.java b/src/main/java/com/android/apkzlib/zip/DataDescriptorType.java index f762852..9b7425e 100644 --- a/src/main/java/com/android/builder/internal/packaging/zip/DataDescriptorType.java +++ b/src/main/java/com/android/apkzlib/zip/DataDescriptorType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.builder.internal.packaging.zip; +package com.android.apkzlib.zip; /** * Type of data descriptor that an entry has. Data descriptors are used if the CRC and sizing data diff --git a/src/main/java/com/android/builder/internal/packaging/zip/EncodeUtils.java b/src/main/java/com/android/apkzlib/zip/EncodeUtils.java index 35ebcf6..9daaa00 100644 --- a/src/main/java/com/android/builder/internal/packaging/zip/EncodeUtils.java +++ b/src/main/java/com/android/apkzlib/zip/EncodeUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.builder.internal.packaging.zip; +package com.android.apkzlib.zip; import com.android.annotations.NonNull; import com.google.common.base.Charsets; diff --git a/src/main/java/com/android/builder/internal/packaging/zip/Eocd.java b/src/main/java/com/android/apkzlib/zip/Eocd.java index 5d3bf33..a5a53be 100644 --- a/src/main/java/com/android/builder/internal/packaging/zip/Eocd.java +++ b/src/main/java/com/android/apkzlib/zip/Eocd.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.android.builder.internal.packaging.zip; +package com.android.apkzlib.zip; import com.android.annotations.NonNull; -import com.android.builder.internal.utils.CachedSupplier; +import com.android.apkzlib.utils.CachedSupplier; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; import com.google.common.base.Verify; diff --git a/src/main/java/com/android/builder/internal/packaging/zip/ExtraField.java b/src/main/java/com/android/apkzlib/zip/ExtraField.java index 27721a9..05f139b 100644 --- a/src/main/java/com/android/builder/internal/packaging/zip/ExtraField.java +++ b/src/main/java/com/android/apkzlib/zip/ExtraField.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.android.builder.internal.packaging.zip; +package com.android.apkzlib.zip; import com.android.annotations.NonNull; import com.android.annotations.Nullable; -import com.android.builder.internal.packaging.zip.utils.LittleEndianUtils; +import com.android.apkzlib.zip.utils.LittleEndianUtils; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; diff --git a/src/main/java/com/android/builder/internal/packaging/zip/FileUseMap.java b/src/main/java/com/android/apkzlib/zip/FileUseMap.java index ab2df9b..7d1ca86 100644 --- a/src/main/java/com/android/builder/internal/packaging/zip/FileUseMap.java +++ b/src/main/java/com/android/apkzlib/zip/FileUseMap.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.builder.internal.packaging.zip; +package com.android.apkzlib.zip; import com.android.annotations.NonNull; import com.android.annotations.Nullable; diff --git a/src/main/java/com/android/builder/internal/packaging/zip/FileUseMapEntry.java b/src/main/java/com/android/apkzlib/zip/FileUseMapEntry.java index c0529c8..e041ae5 100644 --- a/src/main/java/com/android/builder/internal/packaging/zip/FileUseMapEntry.java +++ b/src/main/java/com/android/apkzlib/zip/FileUseMapEntry.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.builder.internal.packaging.zip; +package com.android.apkzlib.zip; import com.android.annotations.NonNull; import com.android.annotations.Nullable; diff --git a/src/main/java/com/android/builder/internal/packaging/zip/GPFlags.java b/src/main/java/com/android/apkzlib/zip/GPFlags.java index 440718a..40965e8 100644 --- a/src/main/java/com/android/builder/internal/packaging/zip/GPFlags.java +++ b/src/main/java/com/android/apkzlib/zip/GPFlags.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.builder.internal.packaging.zip; +package com.android.apkzlib.zip; import com.android.annotations.NonNull; diff --git a/src/main/java/com/android/builder/internal/packaging/zip/InflaterByteSource.java b/src/main/java/com/android/apkzlib/zip/InflaterByteSource.java index 45154cc..8fcf783 100644 --- a/src/main/java/com/android/builder/internal/packaging/zip/InflaterByteSource.java +++ b/src/main/java/com/android/apkzlib/zip/InflaterByteSource.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.android.builder.internal.packaging.zip; +package com.android.apkzlib.zip; import com.android.annotations.NonNull; -import com.android.builder.internal.packaging.zip.utils.CloseableByteSource; +import com.android.apkzlib.zip.utils.CloseableByteSource; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/src/main/java/com/android/builder/internal/packaging/zip/LazyDelegateByteSource.java b/src/main/java/com/android/apkzlib/zip/LazyDelegateByteSource.java index 1620d10..bf1b46b 100644 --- a/src/main/java/com/android/builder/internal/packaging/zip/LazyDelegateByteSource.java +++ b/src/main/java/com/android/apkzlib/zip/LazyDelegateByteSource.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.android.builder.internal.packaging.zip; +package com.android.apkzlib.zip; import com.android.annotations.NonNull; -import com.android.builder.internal.packaging.zip.utils.CloseableByteSource; +import com.android.apkzlib.zip.utils.CloseableByteSource; import com.google.common.hash.HashCode; import com.google.common.hash.HashFunction; import com.google.common.io.ByteProcessor; diff --git a/src/main/java/com/android/builder/internal/packaging/zip/ProcessedAndRawByteSources.java b/src/main/java/com/android/apkzlib/zip/ProcessedAndRawByteSources.java index 1bda379..f108419 100644 --- a/src/main/java/com/android/builder/internal/packaging/zip/ProcessedAndRawByteSources.java +++ b/src/main/java/com/android/apkzlib/zip/ProcessedAndRawByteSources.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.android.builder.internal.packaging.zip; +package com.android.apkzlib.zip; import com.android.annotations.NonNull; -import com.android.builder.internal.packaging.zip.utils.CloseableByteSource; +import com.android.apkzlib.zip.utils.CloseableByteSource; import com.google.common.io.Closer; import java.io.Closeable; diff --git a/src/main/java/com/android/builder/internal/packaging/zip/StoredEntry.java b/src/main/java/com/android/apkzlib/zip/StoredEntry.java index a67c6b2..3057e3c 100644 --- a/src/main/java/com/android/builder/internal/packaging/zip/StoredEntry.java +++ b/src/main/java/com/android/apkzlib/zip/StoredEntry.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.android.builder.internal.packaging.zip; +package com.android.apkzlib.zip; import com.android.annotations.NonNull; import com.android.annotations.Nullable; -import com.android.builder.internal.packaging.zip.utils.CloseableByteSource; -import com.android.builder.internal.packaging.zip.utils.CloseableDelegateByteSource; +import com.android.apkzlib.zip.utils.CloseableByteSource; +import com.android.apkzlib.zip.utils.CloseableDelegateByteSource; import com.google.common.base.Preconditions; import com.google.common.base.Verify; import com.google.common.io.ByteSource; diff --git a/src/main/java/com/android/builder/internal/packaging/zip/StoredEntryType.java b/src/main/java/com/android/apkzlib/zip/StoredEntryType.java index 22983ab..9ce9252 100644 --- a/src/main/java/com/android/builder/internal/packaging/zip/StoredEntryType.java +++ b/src/main/java/com/android/apkzlib/zip/StoredEntryType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.builder.internal.packaging.zip; +package com.android.apkzlib.zip; /** * Type of stored entry. diff --git a/src/main/java/com/android/builder/internal/packaging/zip/ZFile.java b/src/main/java/com/android/apkzlib/zip/ZFile.java index 7048e46..abba7ce 100644 --- a/src/main/java/com/android/builder/internal/packaging/zip/ZFile.java +++ b/src/main/java/com/android/apkzlib/zip/ZFile.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package com.android.builder.internal.packaging.zip; +package com.android.apkzlib.zip; import com.android.annotations.NonNull; import com.android.annotations.Nullable; -import com.android.builder.internal.packaging.zip.utils.ByteTracker; -import com.android.builder.internal.packaging.zip.utils.CloseableByteSource; -import com.android.builder.internal.packaging.zip.utils.LittleEndianUtils; -import com.android.builder.internal.packaging.zip.utils.RandomAccessFileUtils; -import com.android.builder.internal.utils.CachedFileContents; -import com.android.builder.internal.utils.IOExceptionFunction; -import com.android.builder.internal.utils.IOExceptionRunnable; +import com.android.apkzlib.utils.CachedFileContents; +import com.android.apkzlib.utils.IOExceptionFunction; +import com.android.apkzlib.utils.IOExceptionRunnable; +import com.android.apkzlib.zip.utils.ByteTracker; +import com.android.apkzlib.zip.utils.CloseableByteSource; +import com.android.apkzlib.zip.utils.LittleEndianUtils; +import com.android.apkzlib.zip.utils.RandomAccessFileUtils; import com.google.common.base.Preconditions; import com.google.common.base.Verify; import com.google.common.collect.ImmutableList; @@ -328,7 +328,7 @@ public class ZFile implements Closeable { private final List<IOExceptionRunnable> mToRun; /** - * {@code true} when {@link #notify(IOExceptionFunction)} is notifying extensions. Used + * {@code true} when {@link #notify(com.android.apkzlib.utils.IOExceptionFunction)} is notifying extensions. Used * to avoid reordering notifications. */ private boolean mIsNotifying; diff --git a/src/main/java/com/android/builder/internal/packaging/zip/ZFileExtension.java b/src/main/java/com/android/apkzlib/zip/ZFileExtension.java index 2a26caf..fc9484d 100644 --- a/src/main/java/com/android/builder/internal/packaging/zip/ZFileExtension.java +++ b/src/main/java/com/android/apkzlib/zip/ZFileExtension.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.android.builder.internal.packaging.zip; +package com.android.apkzlib.zip; import com.android.annotations.NonNull; import com.android.annotations.Nullable; -import com.android.builder.internal.utils.IOExceptionRunnable; +import com.android.apkzlib.utils.IOExceptionRunnable; import java.io.IOException; /** diff --git a/src/main/java/com/android/builder/internal/packaging/zip/ZFileOptions.java b/src/main/java/com/android/apkzlib/zip/ZFileOptions.java index 2345837..7b92005 100644 --- a/src/main/java/com/android/builder/internal/packaging/zip/ZFileOptions.java +++ b/src/main/java/com/android/apkzlib/zip/ZFileOptions.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.android.builder.internal.packaging.zip; +package com.android.apkzlib.zip; import com.android.annotations.NonNull; -import com.android.builder.internal.packaging.zip.compress.DeflateExecutionCompressor; -import com.android.builder.internal.packaging.zip.utils.ByteTracker; +import com.android.apkzlib.zip.compress.DeflateExecutionCompressor; +import com.android.apkzlib.zip.utils.ByteTracker; import com.google.common.util.concurrent.MoreExecutors; import java.util.zip.Deflater; diff --git a/src/main/java/com/android/builder/internal/packaging/zip/ZipField.java b/src/main/java/com/android/apkzlib/zip/ZipField.java index 1169f69..d6cbcca 100644 --- a/src/main/java/com/android/builder/internal/packaging/zip/ZipField.java +++ b/src/main/java/com/android/apkzlib/zip/ZipField.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.android.builder.internal.packaging.zip; +package com.android.apkzlib.zip; import com.android.annotations.NonNull; import com.android.annotations.Nullable; -import com.android.builder.internal.packaging.zip.utils.LittleEndianUtils; +import com.android.apkzlib.zip.utils.LittleEndianUtils; import com.google.common.base.Preconditions; import com.google.common.base.Verify; import com.google.common.collect.Sets; diff --git a/src/main/java/com/android/builder/internal/packaging/zip/ZipFieldInvariant.java b/src/main/java/com/android/apkzlib/zip/ZipFieldInvariant.java index 0ae76cd..87fc46c 100644 --- a/src/main/java/com/android/builder/internal/packaging/zip/ZipFieldInvariant.java +++ b/src/main/java/com/android/apkzlib/zip/ZipFieldInvariant.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.builder.internal.packaging.zip; +package com.android.apkzlib.zip; /** * A field rule defines an invariant (<em>i.e.</em>, a constraint) that has to be verified by a diff --git a/src/main/java/com/android/builder/internal/packaging/zip/ZipFieldInvariantMaxValue.java b/src/main/java/com/android/apkzlib/zip/ZipFieldInvariantMaxValue.java index 437e2bb..0b2203e 100644 --- a/src/main/java/com/android/builder/internal/packaging/zip/ZipFieldInvariantMaxValue.java +++ b/src/main/java/com/android/apkzlib/zip/ZipFieldInvariantMaxValue.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.builder.internal.packaging.zip; +package com.android.apkzlib.zip; /** * Invariant checking a zip field does not exceed a threshold. diff --git a/src/main/java/com/android/builder/internal/packaging/zip/ZipFieldInvariantNonNegative.java b/src/main/java/com/android/apkzlib/zip/ZipFieldInvariantNonNegative.java index e4d68d8..4d1770b 100644 --- a/src/main/java/com/android/builder/internal/packaging/zip/ZipFieldInvariantNonNegative.java +++ b/src/main/java/com/android/apkzlib/zip/ZipFieldInvariantNonNegative.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.builder.internal.packaging.zip; +package com.android.apkzlib.zip; /** * Invariant that verifies a field's value is not negative. diff --git a/src/main/java/com/android/builder/internal/packaging/zip/ZipFileState.java b/src/main/java/com/android/apkzlib/zip/ZipFileState.java index b3b9990..7ecf2d5 100644 --- a/src/main/java/com/android/builder/internal/packaging/zip/ZipFileState.java +++ b/src/main/java/com/android/apkzlib/zip/ZipFileState.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.builder.internal.packaging.zip; +package com.android.apkzlib.zip; /** * The {@code ZipFileState} enumeration holds the state of a {@link ZFile}. diff --git a/src/main/java/com/android/builder/internal/packaging/zip/compress/BestAndDefaultDeflateExecutorCompressor.java b/src/main/java/com/android/apkzlib/zip/compress/BestAndDefaultDeflateExecutorCompressor.java index 5e132d2..fe19765 100644 --- a/src/main/java/com/android/builder/internal/packaging/zip/compress/BestAndDefaultDeflateExecutorCompressor.java +++ b/src/main/java/com/android/apkzlib/zip/compress/BestAndDefaultDeflateExecutorCompressor.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.android.builder.internal.packaging.zip.compress; +package com.android.apkzlib.zip.compress; import com.android.annotations.NonNull; -import com.android.builder.internal.packaging.zip.CompressionResult; -import com.android.builder.internal.packaging.zip.utils.ByteTracker; -import com.android.builder.internal.packaging.zip.utils.CloseableByteSource; +import com.android.apkzlib.zip.CompressionResult; +import com.android.apkzlib.zip.utils.ByteTracker; +import com.android.apkzlib.zip.utils.CloseableByteSource; import com.google.common.base.Preconditions; import java.util.concurrent.Executor; diff --git a/src/main/java/com/android/builder/internal/packaging/zip/compress/DeflateExecutionCompressor.java b/src/main/java/com/android/apkzlib/zip/compress/DeflateExecutionCompressor.java index d8c6ab9..7eaba11 100644 --- a/src/main/java/com/android/builder/internal/packaging/zip/compress/DeflateExecutionCompressor.java +++ b/src/main/java/com/android/apkzlib/zip/compress/DeflateExecutionCompressor.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.android.builder.internal.packaging.zip.compress; +package com.android.apkzlib.zip.compress; import com.android.annotations.NonNull; -import com.android.builder.internal.packaging.zip.CompressionMethod; -import com.android.builder.internal.packaging.zip.CompressionResult; -import com.android.builder.internal.packaging.zip.utils.ByteTracker; -import com.android.builder.internal.packaging.zip.utils.CloseableByteSource; +import com.android.apkzlib.zip.CompressionMethod; +import com.android.apkzlib.zip.CompressionResult; +import com.android.apkzlib.zip.utils.ByteTracker; +import com.android.apkzlib.zip.utils.CloseableByteSource; import java.io.ByteArrayOutputStream; import java.util.concurrent.Executor; diff --git a/src/main/java/com/android/builder/internal/packaging/zip/compress/ExecutorCompressor.java b/src/main/java/com/android/apkzlib/zip/compress/ExecutorCompressor.java index f52c542..955feb4 100644 --- a/src/main/java/com/android/builder/internal/packaging/zip/compress/ExecutorCompressor.java +++ b/src/main/java/com/android/apkzlib/zip/compress/ExecutorCompressor.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.android.builder.internal.packaging.zip.compress; +package com.android.apkzlib.zip.compress; import com.android.annotations.NonNull; -import com.android.builder.internal.packaging.zip.CompressionResult; -import com.android.builder.internal.packaging.zip.Compressor; -import com.android.builder.internal.packaging.zip.utils.CloseableByteSource; +import com.android.apkzlib.zip.CompressionResult; +import com.android.apkzlib.zip.Compressor; +import com.android.apkzlib.zip.utils.CloseableByteSource; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; diff --git a/src/main/java/com/android/builder/internal/packaging/zip/utils/ByteTracker.java b/src/main/java/com/android/apkzlib/zip/utils/ByteTracker.java index 9c7a719..922d759 100644 --- a/src/main/java/com/android/builder/internal/packaging/zip/utils/ByteTracker.java +++ b/src/main/java/com/android/apkzlib/zip/utils/ByteTracker.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.builder.internal.packaging.zip.utils; +package com.android.apkzlib.zip.utils; import com.android.annotations.NonNull; import com.google.common.io.ByteSource; diff --git a/src/main/java/com/android/builder/internal/packaging/zip/utils/CloseableByteSource.java b/src/main/java/com/android/apkzlib/zip/utils/CloseableByteSource.java index 28afd71..8638a48 100644 --- a/src/main/java/com/android/builder/internal/packaging/zip/utils/CloseableByteSource.java +++ b/src/main/java/com/android/apkzlib/zip/utils/CloseableByteSource.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.builder.internal.packaging.zip.utils; +package com.android.apkzlib.zip.utils; import com.google.common.io.ByteSource; diff --git a/src/main/java/com/android/builder/internal/packaging/zip/utils/CloseableDelegateByteSource.java b/src/main/java/com/android/apkzlib/zip/utils/CloseableDelegateByteSource.java index 7788b9d..9e24936 100644 --- a/src/main/java/com/android/builder/internal/packaging/zip/utils/CloseableDelegateByteSource.java +++ b/src/main/java/com/android/apkzlib/zip/utils/CloseableDelegateByteSource.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.builder.internal.packaging.zip.utils; +package com.android.apkzlib.zip.utils; import com.android.annotations.NonNull; import com.android.annotations.Nullable; diff --git a/src/main/java/com/android/builder/internal/packaging/zip/utils/LittleEndianUtils.java b/src/main/java/com/android/apkzlib/zip/utils/LittleEndianUtils.java index 51885e2..42ddd3f 100644 --- a/src/main/java/com/android/builder/internal/packaging/zip/utils/LittleEndianUtils.java +++ b/src/main/java/com/android/apkzlib/zip/utils/LittleEndianUtils.java @@ -14,16 +14,14 @@ * limitations under the License. */ -package com.android.builder.internal.packaging.zip.utils; +package com.android.apkzlib.zip.utils; import com.android.annotations.NonNull; import com.google.common.base.Preconditions; import com.google.common.base.Verify; -import com.google.common.io.ByteSource; import java.io.EOFException; import java.io.IOException; -import java.io.OutputStream; import java.nio.ByteBuffer; /** diff --git a/src/main/java/com/android/builder/internal/packaging/zip/utils/MsDosDateTimeUtils.java b/src/main/java/com/android/apkzlib/zip/utils/MsDosDateTimeUtils.java index 43c5793..62fa11e 100644 --- a/src/main/java/com/android/builder/internal/packaging/zip/utils/MsDosDateTimeUtils.java +++ b/src/main/java/com/android/apkzlib/zip/utils/MsDosDateTimeUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.builder.internal.packaging.zip.utils; +package com.android.apkzlib.zip.utils; import com.google.common.base.Verify; diff --git a/src/main/java/com/android/builder/internal/packaging/zip/utils/RandomAccessFileUtils.java b/src/main/java/com/android/apkzlib/zip/utils/RandomAccessFileUtils.java index c1ee5b6..051f5df 100644 --- a/src/main/java/com/android/builder/internal/packaging/zip/utils/RandomAccessFileUtils.java +++ b/src/main/java/com/android/apkzlib/zip/utils/RandomAccessFileUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.builder.internal.packaging.zip.utils; +package com.android.apkzlib.zip.utils; import com.android.annotations.NonNull; |