Refactor AndroidBuilder, moving stuff into internal

Change-Id: I0283de43d82686d1981a509d0ae805429330382c

23 files changed, 63 insertions, 48 deletions

diff --git a/builder/src/main/java/com/android/builder/AndroidBuilder.java b/builder/src/main/java/com/android/builder/AndroidBuilder.java
index 29f0309..2f7bbb8 100644
--- a/builder/src/main/java/com/android/builder/AndroidBuilder.java
+++ b/builder/src/main/java/com/android/builder/AndroidBuilder.java
@@ -19,17 +19,22 @@ package com.android.builder;
 import com.android.annotations.NonNull;
 import com.android.annotations.Nullable;
 import com.android.annotations.VisibleForTesting;
-import com.android.builder.compiler.AidlProcessor;
-import com.android.builder.compiler.SourceGenerator;
+import com.android.builder.internal.BuildConfigGenerator;
+import com.android.builder.internal.CommandLineRunner;
+import com.android.builder.internal.SymbolLoader;
+import com.android.builder.internal.SymbolWriter;
+import com.android.builder.internal.TestManifestGenerator;
+import com.android.builder.internal.compiler.AidlProcessor;
+import com.android.builder.internal.compiler.SourceGenerator;
 import com.android.builder.packaging.DuplicateFileException;
-import com.android.builder.packaging.JavaResourceProcessor;
-import com.android.builder.packaging.Packager;
+import com.android.builder.internal.packaging.JavaResourceProcessor;
+import com.android.builder.internal.packaging.Packager;
 import com.android.builder.packaging.PackagerException;
 import com.android.builder.packaging.SealedPackageException;
-import com.android.builder.signing.DebugKeyHelper;
-import com.android.builder.signing.KeystoreHelper;
-import com.android.builder.signing.KeytoolException;
-import com.android.builder.signing.SigningInfo;
+import com.android.builder.internal.signing.DebugKeyHelper;
+import com.android.builder.internal.signing.KeystoreHelper;
+import com.android.builder.internal.signing.KeytoolException;
+import com.android.builder.internal.signing.SigningInfo;
 import com.android.manifmerger.ManifestMerger;
 import com.android.manifmerger.MergerLog;
 import com.android.prefs.AndroidLocation.AndroidLocationException;
diff --git a/builder/src/main/java/com/android/builder/BuildConfigGenerator.java b/builder/src/main/java/com/android/builder/internal/BuildConfigGenerator.java
index 720aaf0..2b2a90f 100644
--- a/builder/src/main/java/com/android/builder/BuildConfigGenerator.java
+++ b/builder/src/main/java/com/android/builder/internal/BuildConfigGenerator.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.builder;
+package com.android.builder.internal;
 
 import com.android.annotations.NonNull;
 import com.android.annotations.Nullable;
@@ -30,7 +30,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
  * Class able to generate a BuildConfig class in Android project.
  * The BuildConfig class contains constants related to the build target.
  */
-class BuildConfigGenerator {
+public class BuildConfigGenerator {
 
     private final static String TEMPLATE = "BuildConfig.template";
     private final static String PH_PACKAGE = "#PACKAGE#";
diff --git a/builder/src/main/java/com/android/builder/CommandLineRunner.java b/builder/src/main/java/com/android/builder/internal/CommandLineRunner.java
index b3cdd76..e074267 100644
--- a/builder/src/main/java/com/android/builder/CommandLineRunner.java
+++ b/builder/src/main/java/com/android/builder/internal/CommandLineRunner.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.builder;
+package com.android.builder.internal;
 
 import com.android.annotations.Nullable;
 import com.android.sdklib.util.GrabProcessOutput;
diff --git a/builder/src/main/java/com/android/builder/SymbolLoader.java b/builder/src/main/java/com/android/builder/internal/SymbolLoader.java
index 387363e..13fb8f5 100644
--- a/builder/src/main/java/com/android/builder/SymbolLoader.java
+++ b/builder/src/main/java/com/android/builder/internal/SymbolLoader.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.builder;
+package com.android.builder.internal;
 
 import com.android.utils.ILogger;
 import com.google.common.base.Charsets;
@@ -28,7 +28,7 @@ import java.util.List;
 
 /**
  */
-class SymbolLoader {
+public class SymbolLoader {
 
     private final File mSymbolFile;
     private Table<String, String, SymbolEntry> mSymbols;
@@ -58,12 +58,12 @@ class SymbolLoader {
         }
     }
 
-    SymbolLoader(File symbolFile, ILogger logger) {
+    public SymbolLoader(File symbolFile, ILogger logger) {
         mSymbolFile = symbolFile;
         mLogger = logger;
     }
 
-    void load() throws IOException {
+    public void load() throws IOException {
         List<String> lines = Files.readLines(mSymbolFile, Charsets.UTF_8);
 
         mSymbols = HashBasedTable.create();
diff --git a/builder/src/main/java/com/android/builder/SymbolWriter.java b/builder/src/main/java/com/android/builder/internal/SymbolWriter.java
index 0c796f6..63f38a8 100644
--- a/builder/src/main/java/com/android/builder/SymbolWriter.java
+++ b/builder/src/main/java/com/android/builder/internal/SymbolWriter.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.builder;
+package com.android.builder.internal;
 
 import com.android.SdkConstants;
-import com.android.builder.SymbolLoader.SymbolEntry;
+import com.android.builder.internal.SymbolLoader.SymbolEntry;
 import com.google.common.base.Charsets;
 import com.google.common.base.Splitter;
 import com.google.common.collect.Table;
@@ -38,14 +38,14 @@ public class SymbolWriter {
     private final SymbolLoader mSymbols;
     private final SymbolLoader mValues;
 
-    SymbolWriter(String outFolder, String packageName, SymbolLoader symbols, SymbolLoader values) {
+    public SymbolWriter(String outFolder, String packageName, SymbolLoader symbols, SymbolLoader values) {
         mOutFolder = outFolder;
         mPackageName = packageName;
         mSymbols = symbols;
         mValues = values;
     }
 
-    void write() throws IOException {
+    public void write() throws IOException {
         Splitter splitter = Splitter.on('.');
         Iterable<String> folders = splitter.split(mPackageName);
         File file = new File(mOutFolder);
diff --git a/builder/src/main/java/com/android/builder/TemplateProcessor.java b/builder/src/main/java/com/android/builder/internal/TemplateProcessor.java
index edda1a3..d489652 100644
--- a/builder/src/main/java/com/android/builder/TemplateProcessor.java
+++ b/builder/src/main/java/com/android/builder/internal/TemplateProcessor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.builder;
+package com.android.builder.internal;
 
 import com.android.annotations.NonNull;
 import com.google.common.base.Charsets;
diff --git a/builder/src/main/java/com/android/builder/TestManifestGenerator.java b/builder/src/main/java/com/android/builder/internal/TestManifestGenerator.java
index c988d6f..0c478be 100644
--- a/builder/src/main/java/com/android/builder/TestManifestGenerator.java
+++ b/builder/src/main/java/com/android/builder/internal/TestManifestGenerator.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.builder;
+package com.android.builder.internal;
 
 import com.android.annotations.NonNull;
 
@@ -39,7 +39,7 @@ public class TestManifestGenerator {
     private final String mTestedPackageName;
     private final String mTestRunnerName;
 
-    TestManifestGenerator(@NonNull String outputFile,
+    public TestManifestGenerator(@NonNull String outputFile,
                           @NonNull String packageName,
                           int minSdkVersion,
                           @NonNull String testedPackageName,
diff --git a/builder/src/main/java/com/android/builder/compiler/AidlProcessor.java b/builder/src/main/java/com/android/builder/internal/compiler/AidlProcessor.java
index 9bd3398..5d7de56 100644
--- a/builder/src/main/java/com/android/builder/compiler/AidlProcessor.java
+++ b/builder/src/main/java/com/android/builder/internal/compiler/AidlProcessor.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.builder.compiler;
+package com.android.builder.internal.compiler;
 
 import com.android.annotations.NonNull;
-import com.android.builder.CommandLineRunner;
-import com.android.builder.compiler.SourceGenerator.DisplayType;
+import com.android.builder.internal.CommandLineRunner;
+import com.android.builder.internal.compiler.SourceGenerator.DisplayType;
 import com.android.utils.ILogger;
 import com.google.common.collect.Lists;
 
diff --git a/builder/src/main/java/com/android/builder/compiler/DependencyGraph.java b/builder/src/main/java/com/android/builder/internal/compiler/DependencyGraph.java
index 785412a..3ca2ae3 100644
--- a/builder/src/main/java/com/android/builder/compiler/DependencyGraph.java
+++ b/builder/src/main/java/com/android/builder/internal/compiler/DependencyGraph.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.builder.compiler;
+package com.android.builder.internal.compiler;
 
 import com.android.utils.ILogger;
 import com.google.common.base.Charsets;
diff --git a/builder/src/main/java/com/android/builder/compiler/InputPath.java b/builder/src/main/java/com/android/builder/internal/compiler/InputPath.java
index 5f422a5..defdea1 100644
--- a/builder/src/main/java/com/android/builder/compiler/InputPath.java
+++ b/builder/src/main/java/com/android/builder/internal/compiler/InputPath.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.builder.compiler;
+package com.android.builder.internal.compiler;
 
 import java.io.File;
 import java.util.Set;
diff --git a/builder/src/main/java/com/android/builder/compiler/SourceGenerator.java b/builder/src/main/java/com/android/builder/internal/compiler/SourceGenerator.java
index 627a88d..b06e664 100644
--- a/builder/src/main/java/com/android/builder/compiler/SourceGenerator.java
+++ b/builder/src/main/java/com/android/builder/internal/compiler/SourceGenerator.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.builder.compiler;
+package com.android.builder.internal.compiler;
 
 import com.android.utils.ILogger;
 import com.google.common.collect.Lists;
diff --git a/builder/src/main/java/com/android/builder/packaging/JavaResourceProcessor.java b/builder/src/main/java/com/android/builder/internal/packaging/JavaResourceProcessor.java
index 57e61ba..48f098f 100644
--- a/builder/src/main/java/com/android/builder/packaging/JavaResourceProcessor.java
+++ b/builder/src/main/java/com/android/builder/internal/packaging/JavaResourceProcessor.java
@@ -14,9 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.builder.packaging;
+package com.android.builder.internal.packaging;
 
 
+import com.android.builder.packaging.DuplicateFileException;
+import com.android.builder.packaging.PackagerException;
+import com.android.builder.packaging.SealedPackageException;
+
 import java.io.File;
 import java.io.IOException;
 
@@ -30,9 +34,9 @@ public class JavaResourceProcessor {
          * Adds a file to the archive at a given path
          * @param file the file to add
          * @param archivePath the path of the file inside the APK archive.
-         * @throws PackagerException if an error occurred
-         * @throws SealedPackageException if the archive is already sealed.
-         * @throws DuplicateFileException if a file conflicts with another already added to the APK
+         * @throws com.android.builder.packaging.PackagerException if an error occurred
+         * @throws com.android.builder.packaging.SealedPackageException if the archive is already sealed.
+         * @throws com.android.builder.packaging.DuplicateFileException if a file conflicts with another already added to the APK
          *                                   at the same location inside the APK archive.
          */
         void addFile(File file, String archivePath) throws PackagerException,
diff --git a/builder/src/main/java/com/android/builder/packaging/Packager.java b/builder/src/main/java/com/android/builder/internal/packaging/Packager.java
index 2a02916..3e48619 100644
--- a/builder/src/main/java/com/android/builder/packaging/Packager.java
+++ b/builder/src/main/java/com/android/builder/internal/packaging/Packager.java
@@ -14,14 +14,17 @@
  * limitations under the License.
  */
 
-package com.android.builder.packaging;
+package com.android.builder.internal.packaging;
 
 import com.android.SdkConstants;
 import com.android.annotations.NonNull;
-import com.android.builder.packaging.JavaResourceProcessor.IArchiveBuilder;
-import com.android.builder.signing.SignedJarBuilder;
-import com.android.builder.signing.SignedJarBuilder.IZipEntryFilter;
-import com.android.builder.signing.SigningInfo;
+import com.android.builder.internal.packaging.JavaResourceProcessor.IArchiveBuilder;
+import com.android.builder.internal.signing.SignedJarBuilder;
+import com.android.builder.internal.signing.SignedJarBuilder.IZipEntryFilter;
+import com.android.builder.internal.signing.SigningInfo;
+import com.android.builder.packaging.DuplicateFileException;
+import com.android.builder.packaging.PackagerException;
+import com.android.builder.packaging.SealedPackageException;
 import com.android.sdklib.internal.build.DebugKeyProvider;
 import com.android.utils.ILogger;
 
@@ -218,7 +221,7 @@ public final class Packager implements IArchiveBuilder {
      * @param dexLocation the file representing the dex file. This can be null for apk with no code.
      * @param signingInfo the signing information used to sign the package. Optional the OS path to the debug keystore, if needed or null.
      * @param logger the logger.
-     * @throws PackagerException
+     * @throws com.android.builder.packaging.PackagerException
      */
     public Packager(
             @NonNull String apkLocation,
@@ -292,7 +295,7 @@ public final class Packager implements IArchiveBuilder {
      * @param file the file to add
      * @param archivePath the path of the file inside the APK archive.
      * @throws PackagerException if an error occurred
-     * @throws SealedPackageException if the APK is already sealed.
+     * @throws com.android.builder.packaging.SealedPackageException if the APK is already sealed.
      * @throws DuplicateFileException if a file conflicts with another already added to the APK
      *                                   at the same location inside the APK archive.
      */
diff --git a/builder/src/main/java/com/android/builder/signing/DebugKeyHelper.java b/builder/src/main/java/com/android/builder/internal/signing/DebugKeyHelper.java
index 2080599..3d0a7da 100644
--- a/builder/src/main/java/com/android/builder/signing/DebugKeyHelper.java
+++ b/builder/src/main/java/com/android/builder/internal/signing/DebugKeyHelper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.builder.signing;
+package com.android.builder.internal.signing;
 
 import com.android.annotations.NonNull;
 import com.android.prefs.AndroidLocation;
diff --git a/builder/src/main/java/com/android/builder/signing/KeystoreHelper.java b/builder/src/main/java/com/android/builder/internal/signing/KeystoreHelper.java
index 69eb3f4..05f609d 100644
--- a/builder/src/main/java/com/android/builder/signing/KeystoreHelper.java
+++ b/builder/src/main/java/com/android/builder/internal/signing/KeystoreHelper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.builder.signing;
+package com.android.builder.internal.signing;
 
 import com.android.annotations.NonNull;
 import com.android.annotations.Nullable;
diff --git a/builder/src/main/java/com/android/builder/signing/KeytoolException.java b/builder/src/main/java/com/android/builder/internal/signing/KeytoolException.java
index 890096c..a895509 100644
--- a/builder/src/main/java/com/android/builder/signing/KeytoolException.java
+++ b/builder/src/main/java/com/android/builder/internal/signing/KeytoolException.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.builder.signing;
+package com.android.builder.internal.signing;
 
 public class KeytoolException extends Exception {
     /** default serial uid */
diff --git a/builder/src/main/java/com/android/builder/signing/SignedJarBuilder.java b/builder/src/main/java/com/android/builder/internal/signing/SignedJarBuilder.java
index 8bb042f..332583d 100644
--- a/builder/src/main/java/com/android/builder/signing/SignedJarBuilder.java
+++ b/builder/src/main/java/com/android/builder/internal/signing/SignedJarBuilder.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.builder.signing;
+package com.android.builder.internal.signing;
 
-import com.android.builder.signing.SignedJarBuilder.IZipEntryFilter.ZipAbortException;
+import com.android.builder.internal.signing.SignedJarBuilder.IZipEntryFilter.ZipAbortException;
 
 import sun.misc.BASE64Encoder;
 import sun.security.pkcs.ContentInfo;
diff --git a/builder/src/main/java/com/android/builder/signing/SigningInfo.java b/builder/src/main/java/com/android/builder/internal/signing/SigningInfo.java
index c06fe57..a123122 100644
--- a/builder/src/main/java/com/android/builder/signing/SigningInfo.java
+++ b/builder/src/main/java/com/android/builder/internal/signing/SigningInfo.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.builder.signing;
+package com.android.builder.internal.signing;
 
 import com.android.annotations.NonNull;
 
diff --git a/builder/src/main/java/com/android/builder/packaging/DuplicateFileException.java b/builder/src/main/java/com/android/builder/packaging/DuplicateFileException.java
index d186bfb..ae3ee44 100644
--- a/builder/src/main/java/com/android/builder/packaging/DuplicateFileException.java
+++ b/builder/src/main/java/com/android/builder/packaging/DuplicateFileException.java
@@ -17,7 +17,7 @@
 package com.android.builder.packaging;
 
 import com.android.annotations.NonNull;
-import com.android.builder.signing.SignedJarBuilder.IZipEntryFilter.ZipAbortException;
+import com.android.builder.internal.signing.SignedJarBuilder.IZipEntryFilter.ZipAbortException;
 
 import java.io.File;
 
diff --git a/builder/src/main/resources/com/android/builder/AndroidManifest.template b/builder/src/main/resources/com/android/builder/internal/AndroidManifest.template
index ad1893b..ad1893b 100644
--- a/builder/src/main/resources/com/android/builder/AndroidManifest.template
+++ b/builder/src/main/resources/com/android/builder/internal/AndroidManifest.template
diff --git a/builder/src/main/resources/com/android/builder/BuildConfig.template b/builder/src/main/resources/com/android/builder/internal/BuildConfig.template
index 618c013..618c013 100644
--- a/builder/src/main/resources/com/android/builder/BuildConfig.template
+++ b/builder/src/main/resources/com/android/builder/internal/BuildConfig.template
diff --git a/builder/src/test/java/com/android/builder/SymbolLoaderTest.java b/builder/src/test/java/com/android/builder/internal/SymbolLoaderTest.java
index 17520cf..0c0b79a 100644
--- a/builder/src/test/java/com/android/builder/SymbolLoaderTest.java
+++ b/builder/src/test/java/com/android/builder/internal/SymbolLoaderTest.java
@@ -13,8 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.builder;
+package com.android.builder.internal;
 
+import com.android.builder.internal.SymbolLoader;
 import com.android.utils.NullLogger;
 import com.google.common.base.Charsets;
 import com.google.common.collect.Table;
diff --git a/builder/src/test/java/com/android/builder/SymbolWriterTest.java b/builder/src/test/java/com/android/builder/internal/SymbolWriterTest.java
index b24bb7c..5b26f48 100644
--- a/builder/src/test/java/com/android/builder/SymbolWriterTest.java
+++ b/builder/src/test/java/com/android/builder/internal/SymbolWriterTest.java
@@ -13,8 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.builder;
+package com.android.builder.internal;
 
+import com.android.builder.internal.SymbolLoader;
+import com.android.builder.internal.SymbolWriter;
 import com.android.utils.NullLogger;
 import com.google.common.base.Charsets;
 import com.google.common.collect.Table;