Renamed apkzlib packages.

Test: Included
Change-Id: I9cce74b77719003875deaa5a0056e35f2930429e

23 files changed, 58 insertions, 58 deletions

diff --git a/src/test/java/com/android/builder/internal/packaging/sign/FullApkSignTest.java b/src/test/java/com/android/apkzlib/sign/FullApkSignTest.java
index e9c2c90..d41978a 100644
--- a/src/test/java/com/android/builder/internal/packaging/sign/FullApkSignTest.java
+++ b/src/test/java/com/android/apkzlib/sign/FullApkSignTest.java
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package com.android.builder.internal.packaging.sign;
+package com.android.apkzlib.sign;
 
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertNotNull;
 
-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.internal.packaging.zip.ZFileTestConstants;
-import com.android.builder.internal.utils.ApkZFileTestUtils;
-import com.android.builder.internal.utils.ApkZLibPair;
+import com.android.apkzlib.utils.ApkZLibPair;
+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.android.apkzlib.zip.ZFileTestConstants;
+import com.android.apkzlib.utils.ApkZFileTestUtils;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.security.PrivateKey;
diff --git a/src/test/java/com/android/builder/internal/packaging/sign/JarSigningTest.java b/src/test/java/com/android/apkzlib/sign/JarSigningTest.java
index 78c633e..191bf53 100644
--- a/src/test/java/com/android/builder/internal/packaging/sign/JarSigningTest.java
+++ b/src/test/java/com/android/apkzlib/sign/JarSigningTest.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 static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
 
-import com.android.builder.internal.packaging.zip.StoredEntry;
-import com.android.builder.internal.packaging.zip.ZFile;
-import com.android.builder.internal.utils.ApkZFileTestUtils;
-import com.android.builder.internal.utils.ApkZLibPair;
+import com.android.apkzlib.zip.StoredEntry;
+import com.android.apkzlib.zip.ZFile;
+import com.android.apkzlib.utils.ApkZFileTestUtils;
+import com.android.apkzlib.utils.ApkZLibPair;
 import com.google.common.base.Charsets;
 import com.google.common.hash.Hashing;
 import java.io.ByteArrayInputStream;
diff --git a/src/test/java/com/android/builder/internal/packaging/sign/ManifestGenerationTest.java b/src/test/java/com/android/apkzlib/sign/ManifestGenerationTest.java
index 5d50522..746617b 100644
--- a/src/test/java/com/android/builder/internal/packaging/sign/ManifestGenerationTest.java
+++ b/src/test/java/com/android/apkzlib/sign/ManifestGenerationTest.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,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.android.builder.internal.packaging.sign;
+package com.android.apkzlib.sign;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-import com.android.builder.internal.packaging.zip.StoredEntry;
-import com.android.builder.internal.packaging.zip.ZFile;
-import com.android.builder.internal.utils.ApkZFileTestUtils;
+import com.android.apkzlib.zip.StoredEntry;
+import com.android.apkzlib.zip.ZFile;
+import com.android.apkzlib.utils.ApkZFileTestUtils;
 import com.google.common.base.Charsets;
 import com.google.common.io.Closer;
 import java.io.ByteArrayInputStream;
diff --git a/src/test/java/com/android/builder/internal/packaging/sign/SignatureTestUtils.java b/src/test/java/com/android/apkzlib/sign/SignatureTestUtils.java
index f827a43..71610ef 100644
--- a/src/test/java/com/android/builder/internal/packaging/sign/SignatureTestUtils.java
+++ b/src/test/java/com/android/apkzlib/sign/SignatureTestUtils.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.builder.internal.packaging.sign;
+package com.android.apkzlib.sign;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.fail;
 
 import com.android.annotations.NonNull;
-import com.android.builder.internal.utils.ApkZLibPair;
+import com.android.apkzlib.utils.ApkZLibPair;
 import java.math.BigInteger;
 import java.security.KeyPair;
 import java.security.KeyPairGenerator;
diff --git a/src/test/java/com/android/builder/internal/utils/ApkZFileTestUtils.java b/src/test/java/com/android/apkzlib/utils/ApkZFileTestUtils.java
index 88e3c80..bb379b5 100644
--- a/src/test/java/com/android/builder/internal/utils/ApkZFileTestUtils.java
+++ b/src/test/java/com/android/apkzlib/utils/ApkZFileTestUtils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.builder.internal.utils;
+package com.android.apkzlib.utils;
 
 import static org.junit.Assert.assertTrue;
 
diff --git a/src/test/java/com/android/builder/internal/utils/CachedFileContentsTest.java b/src/test/java/com/android/apkzlib/utils/CachedFileContentsTest.java
index 282ca47..f9654d7 100644
--- a/src/test/java/com/android/builder/internal/utils/CachedFileContentsTest.java
+++ b/src/test/java/com/android/apkzlib/utils/CachedFileContentsTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.builder.internal.utils;
+package com.android.apkzlib.utils;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
diff --git a/src/test/java/com/android/builder/internal/utils/CachedSupplierTest.java b/src/test/java/com/android/apkzlib/utils/CachedSupplierTest.java
index e8ce7b3..e687bf3 100644
--- a/src/test/java/com/android/builder/internal/utils/CachedSupplierTest.java
+++ b/src/test/java/com/android/apkzlib/utils/CachedSupplierTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.builder.internal.utils;
+package com.android.apkzlib.utils;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/src/test/java/com/android/builder/internal/packaging/zip/AlignmentTest.java b/src/test/java/com/android/apkzlib/zip/AlignmentTest.java
index 3241bd3..3dfe917 100644
--- a/src/test/java/com/android/builder/internal/packaging/zip/AlignmentTest.java
+++ b/src/test/java/com/android/apkzlib/zip/AlignmentTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.builder.internal.packaging.zip;
+package com.android.apkzlib.zip;
 
-import static com.android.builder.internal.utils.ApkZFileTestUtils.readSegment;
+import static com.android.apkzlib.utils.ApkZFileTestUtils.readSegment;
 import static junit.framework.TestCase.assertEquals;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertFalse;
diff --git a/src/test/java/com/android/builder/internal/packaging/zip/EncodeUtilsTest.java b/src/test/java/com/android/apkzlib/zip/EncodeUtilsTest.java
index 91e9676..0eaf1cb 100644
--- a/src/test/java/com/android/builder/internal/packaging/zip/EncodeUtilsTest.java
+++ b/src/test/java/com/android/apkzlib/zip/EncodeUtilsTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.builder.internal.packaging.zip;
+package com.android.apkzlib.zip;
 
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
diff --git a/src/test/java/com/android/builder/internal/packaging/zip/ExtraFieldTest.java b/src/test/java/com/android/apkzlib/zip/ExtraFieldTest.java
index d4275d0..d80ccc4 100644
--- a/src/test/java/com/android/builder/internal/packaging/zip/ExtraFieldTest.java
+++ b/src/test/java/com/android/apkzlib/zip/ExtraFieldTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.builder.internal.packaging.zip;
+package com.android.apkzlib.zip;
 
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
diff --git a/src/test/java/com/android/builder/internal/packaging/zip/FileUseMapTest.java b/src/test/java/com/android/apkzlib/zip/FileUseMapTest.java
index a53e9cb..0ee0129 100644
--- a/src/test/java/com/android/builder/internal/packaging/zip/FileUseMapTest.java
+++ b/src/test/java/com/android/apkzlib/zip/FileUseMapTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.builder.internal.packaging.zip;
+package com.android.apkzlib.zip;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
diff --git a/src/test/java/com/android/builder/internal/packaging/zip/OldApkReadTest.java b/src/test/java/com/android/apkzlib/zip/OldApkReadTest.java
index 3121c44..61a08d7 100644
--- a/src/test/java/com/android/builder/internal/packaging/zip/OldApkReadTest.java
+++ b/src/test/java/com/android/apkzlib/zip/OldApkReadTest.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.builder.internal.packaging.zip;
+package com.android.apkzlib.zip;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-import com.android.builder.internal.utils.ApkZFileTestUtils;
+import com.android.apkzlib.utils.ApkZFileTestUtils;
 import java.io.File;
 import org.junit.Test;
 
diff --git a/src/test/java/com/android/builder/internal/packaging/zip/ReadWithDifferentCompressionLevelsTest.java b/src/test/java/com/android/apkzlib/zip/ReadWithDifferentCompressionLevelsTest.java
index 154dfcd..4301710 100644
--- a/src/test/java/com/android/builder/internal/packaging/zip/ReadWithDifferentCompressionLevelsTest.java
+++ b/src/test/java/com/android/apkzlib/zip/ReadWithDifferentCompressionLevelsTest.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.builder.internal.packaging.zip;
+package com.android.apkzlib.zip;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-import com.android.builder.internal.utils.ApkZFileTestUtils;
+import com.android.apkzlib.utils.ApkZFileTestUtils;
 import java.io.File;
 import org.junit.Test;
 
diff --git a/src/test/java/com/android/builder/internal/packaging/zip/ZFileNotificationTest.java b/src/test/java/com/android/apkzlib/zip/ZFileNotificationTest.java
index b7c490f..8d01f0d 100644
--- a/src/test/java/com/android/builder/internal/packaging/zip/ZFileNotificationTest.java
+++ b/src/test/java/com/android/apkzlib/zip/ZFileNotificationTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.builder.internal.packaging.zip;
+package com.android.apkzlib.zip;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -23,8 +23,8 @@ import static org.junit.Assert.assertSame;
 
 import com.android.annotations.NonNull;
 import com.android.annotations.Nullable;
-import com.android.builder.internal.utils.ApkZLibPair;
-import com.android.builder.internal.utils.IOExceptionRunnable;
+import com.android.apkzlib.utils.ApkZLibPair;
+import com.android.apkzlib.utils.IOExceptionRunnable;
 import com.google.common.collect.Lists;
 
 import org.junit.Rule;
diff --git a/src/test/java/com/android/builder/internal/packaging/zip/ZFileSortTest.java b/src/test/java/com/android/apkzlib/zip/ZFileSortTest.java
index 41e5301..6ad7bd1 100644
--- a/src/test/java/com/android/builder/internal/packaging/zip/ZFileSortTest.java
+++ b/src/test/java/com/android/apkzlib/zip/ZFileSortTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.builder.internal.packaging.zip;
+package com.android.apkzlib.zip;
 
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
diff --git a/src/test/java/com/android/builder/internal/packaging/zip/ZFileTest.java b/src/test/java/com/android/apkzlib/zip/ZFileTest.java
index 0b54b44..3619691 100644
--- a/src/test/java/com/android/builder/internal/packaging/zip/ZFileTest.java
+++ b/src/test/java/com/android/apkzlib/zip/ZFileTest.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.builder.internal.packaging.zip;
+package com.android.apkzlib.zip;
 
-import static com.android.builder.internal.utils.ApkZFileTestUtils.readSegment;
+import static com.android.apkzlib.utils.ApkZFileTestUtils.readSegment;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -28,9 +28,9 @@ import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import com.android.annotations.NonNull;
-import com.android.builder.internal.packaging.zip.compress.DeflateExecutionCompressor;
-import com.android.builder.internal.packaging.zip.utils.CloseableByteSource;
-import com.android.builder.internal.packaging.zip.utils.RandomAccessFileUtils;
+import com.android.apkzlib.zip.compress.DeflateExecutionCompressor;
+import com.android.apkzlib.zip.utils.CloseableByteSource;
+import com.android.apkzlib.zip.utils.RandomAccessFileUtils;
 import com.google.common.base.Charsets;
 import com.google.common.base.Strings;
 import com.google.common.base.Throwables;
diff --git a/src/test/java/com/android/builder/internal/packaging/zip/ZFileTestConstants.java b/src/test/java/com/android/apkzlib/zip/ZFileTestConstants.java
index 40189cb..fbf5739 100644
--- a/src/test/java/com/android/builder/internal/packaging/zip/ZFileTestConstants.java
+++ b/src/test/java/com/android/apkzlib/zip/ZFileTestConstants.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.builder.internal.packaging.zip;
+package com.android.apkzlib.zip;
 
 /**
  * Constants used in tests.
diff --git a/src/test/java/com/android/builder/internal/packaging/zip/ZipMergeTest.java b/src/test/java/com/android/apkzlib/zip/ZipMergeTest.java
index fb29395..aa3e787 100644
--- a/src/test/java/com/android/builder/internal/packaging/zip/ZipMergeTest.java
+++ b/src/test/java/com/android/apkzlib/zip/ZipMergeTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.builder.internal.packaging.zip;
+package com.android.apkzlib.zip;
 
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
@@ -23,7 +23,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
-import com.android.builder.internal.utils.CachedFileContents;
+import com.android.apkzlib.utils.CachedFileContents;
 import com.google.common.base.Charsets;
 import com.google.common.hash.Hashing;
 import com.google.common.io.ByteStreams;
diff --git a/src/test/java/com/android/builder/internal/packaging/zip/ZipTestUtils.java b/src/test/java/com/android/apkzlib/zip/ZipTestUtils.java
index 7d2e6df..d9c6aa8 100644
--- a/src/test/java/com/android/builder/internal/packaging/zip/ZipTestUtils.java
+++ b/src/test/java/com/android/apkzlib/zip/ZipTestUtils.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.builder.internal.packaging.zip;
+package com.android.apkzlib.zip;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import com.android.annotations.NonNull;
-import com.android.builder.internal.utils.ApkZFileTestUtils;
+import com.android.apkzlib.utils.ApkZFileTestUtils;
 import com.google.common.io.Files;
 
 import org.junit.rules.TemporaryFolder;
diff --git a/src/test/java/com/android/builder/internal/packaging/zip/ZipToolsTest.java b/src/test/java/com/android/apkzlib/zip/ZipToolsTest.java
index c0bd788..e7f837e 100644
--- a/src/test/java/com/android/builder/internal/packaging/zip/ZipToolsTest.java
+++ b/src/test/java/com/android/apkzlib/zip/ZipToolsTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.builder.internal.packaging.zip;
+package com.android.apkzlib.zip;
 
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
diff --git a/src/test/java/com/android/builder/internal/packaging/zip/compress/MultiCompressorTest.java b/src/test/java/com/android/apkzlib/zip/compress/MultiCompressorTest.java
index 2fc7bf7..97903b2 100644
--- a/src/test/java/com/android/builder/internal/packaging/zip/compress/MultiCompressorTest.java
+++ b/src/test/java/com/android/apkzlib/zip/compress/MultiCompressorTest.java
@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package com.android.builder.internal.packaging.zip.compress;
+package com.android.apkzlib.zip.compress;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-import com.android.builder.internal.packaging.zip.CentralDirectoryHeaderCompressInfo;
-import com.android.builder.internal.packaging.zip.CompressionMethod;
-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.internal.utils.ApkZFileTestUtils;
+import com.android.apkzlib.zip.CentralDirectoryHeaderCompressInfo;
+import com.android.apkzlib.zip.CompressionMethod;
+import com.android.apkzlib.zip.StoredEntry;
+import com.android.apkzlib.zip.ZFile;
+import com.android.apkzlib.zip.ZFileOptions;
+import com.android.apkzlib.utils.ApkZFileTestUtils;
 import com.google.common.io.Files;
 import com.google.common.util.concurrent.MoreExecutors;
 import java.io.ByteArrayInputStream;
diff --git a/src/test/java/com/android/builder/internal/packaging/zip/utils/LittleEndianUtilsTest.java b/src/test/java/com/android/apkzlib/zip/utils/LittleEndianUtilsTest.java
index 855f39f..3264290 100644
--- a/src/test/java/com/android/builder/internal/packaging/zip/utils/LittleEndianUtilsTest.java
+++ b/src/test/java/com/android/apkzlib/zip/utils/LittleEndianUtilsTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.builder.internal.packaging.zip.utils;
+package com.android.apkzlib.zip.utils;
 
 import static junit.framework.TestCase.assertEquals;
 import static org.junit.Assert.assertArrayEquals;
diff --git a/src/test/java/com/android/builder/internal/packaging/zip/utils/MsDosDateTimeUtilsTest.java b/src/test/java/com/android/apkzlib/zip/utils/MsDosDateTimeUtilsTest.java
index 4c098c8..012d587 100644
--- a/src/test/java/com/android/builder/internal/packaging/zip/utils/MsDosDateTimeUtilsTest.java
+++ b/src/test/java/com/android/apkzlib/zip/utils/MsDosDateTimeUtilsTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.builder.internal.packaging.zip.utils;
+package com.android.apkzlib.zip.utils;
 
 import static org.junit.Assert.assertEquals;