Minor refactoring.

Rename TextSymbolProvier -> SymbolFileProvider

Also make AndroidDependency implement ManifestDependency
instead of ManifestProvider so that they can be passed
to AndroidBuilder.processManifest()

Change-Id: I94af6f5a45dd1a3b5130bef58a73f21c486f2987

7 files changed, 10 insertions, 14 deletions

diff --git a/builder/src/main/java/com/android/builder/AndroidBuilder.java b/builder/src/main/java/com/android/builder/AndroidBuilder.java
index 2f7bbb8..ddc77af 100644
--- a/builder/src/main/java/com/android/builder/AndroidBuilder.java
+++ b/builder/src/main/java/com/android/builder/AndroidBuilder.java
@@ -26,15 +26,15 @@ 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.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.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.builder.packaging.DuplicateFileException;
+import com.android.builder.packaging.PackagerException;
+import com.android.builder.packaging.SealedPackageException;
 import com.android.manifmerger.ManifestMerger;
 import com.android.manifmerger.MergerLog;
 import com.android.prefs.AndroidLocation.AndroidLocationException;
@@ -517,7 +517,7 @@ public class AndroidBuilder {
             @Nullable File preprocessResDir,
             @NonNull  Iterable<File> resInputs,
             @Nullable File assetsDir,
-            @NonNull  List<TextSymbolProvider> libraries,
+            @NonNull  List<SymbolFileProvider> libraries,
             @Nullable String packageOverride,
             @Nullable String sourceOutputDir,
             @Nullable String symbolOutputDir,
@@ -657,8 +657,8 @@ public class AndroidBuilder {
         if (type != VariantConfiguration.Type.LIBRARY && !libraries.isEmpty()) {
             SymbolLoader symbolValues = null;
 
-            for (TextSymbolProvider lib : libraries) {
-                File rFile = lib.getTextSymbol();
+            for (SymbolFileProvider lib : libraries) {
+                File rFile = lib.getSymbolFile();
                 // if the library has no resource, this file won't exist.
                 if (rFile.isFile()) {
                     // load the values if that's not already been done.
diff --git a/builder/src/main/java/com/android/builder/AndroidDependency.java b/builder/src/main/java/com/android/builder/AndroidDependency.java
index b79bd84..b907c49 100644
--- a/builder/src/main/java/com/android/builder/AndroidDependency.java
+++ b/builder/src/main/java/com/android/builder/AndroidDependency.java
@@ -22,7 +22,7 @@ import java.util.List;
 /**
  * Represents a dependency on a Library Project.
  */
-public interface AndroidDependency extends ManifestProvider, TextSymbolProvider {
+public interface AndroidDependency extends ManifestDependency, SymbolFileProvider {
 
     /**
      * Returns the location of the unarchived bundle.
diff --git a/builder/src/main/java/com/android/builder/BundleDependency.java b/builder/src/main/java/com/android/builder/BundleDependency.java
index 7b98a50..022191b 100644
--- a/builder/src/main/java/com/android/builder/BundleDependency.java
+++ b/builder/src/main/java/com/android/builder/BundleDependency.java
@@ -60,7 +60,7 @@ public abstract class BundleDependency implements AndroidDependency {
     }
 
     @Override
-    public File getTextSymbol() {
+    public File getSymbolFile() {
         return new File(mBundleFolder, "R.txt");
     }
 
diff --git a/builder/src/main/java/com/android/builder/TextSymbolProvider.java b/builder/src/main/java/com/android/builder/SymbolFileProvider.java
index 2d9187d..59241a4 100644
--- a/builder/src/main/java/com/android/builder/TextSymbolProvider.java
+++ b/builder/src/main/java/com/android/builder/SymbolFileProvider.java
@@ -21,10 +21,10 @@ import java.io.File;
 /**
  * Provides a path to the Text Symbol file and to the Android Manifest
  */
-public interface TextSymbolProvider extends ManifestProvider {
+public interface SymbolFileProvider extends ManifestProvider {
 
     /**
      * Returns the location of the text symbol file
      */
-    File getTextSymbol();
+    File getSymbolFile();
 }
diff --git a/builder/src/main/java/com/android/builder/internal/signing/SignedJarBuilder.java b/builder/src/main/java/com/android/builder/internal/signing/SignedJarBuilder.java
index 332583d..fd4a2d5 100644
--- a/builder/src/main/java/com/android/builder/internal/signing/SignedJarBuilder.java
+++ b/builder/src/main/java/com/android/builder/internal/signing/SignedJarBuilder.java
@@ -17,7 +17,6 @@
 package com.android.builder.internal.signing;
 
 import com.android.builder.internal.signing.SignedJarBuilder.IZipEntryFilter.ZipAbortException;
-
 import sun.misc.BASE64Encoder;
 import sun.security.pkcs.ContentInfo;
 import sun.security.pkcs.PKCS7;
diff --git a/builder/src/test/java/com/android/builder/internal/SymbolLoaderTest.java b/builder/src/test/java/com/android/builder/internal/SymbolLoaderTest.java
index 0c0b79a..e5b9170 100644
--- a/builder/src/test/java/com/android/builder/internal/SymbolLoaderTest.java
+++ b/builder/src/test/java/com/android/builder/internal/SymbolLoaderTest.java
@@ -15,7 +15,6 @@
  */
 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/internal/SymbolWriterTest.java b/builder/src/test/java/com/android/builder/internal/SymbolWriterTest.java
index 5b26f48..757973a 100644
--- a/builder/src/test/java/com/android/builder/internal/SymbolWriterTest.java
+++ b/builder/src/test/java/com/android/builder/internal/SymbolWriterTest.java
@@ -15,8 +15,6 @@
  */
 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;