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

4 files changed, 21 insertions, 15 deletions

diff --git a/gradle/src/main/groovy/com/android/build/gradle/BasePlugin.groovy b/gradle/src/main/groovy/com/android/build/gradle/BasePlugin.groovy
index d49f35a..69a8668 100644
--- a/gradle/src/main/groovy/com/android/build/gradle/BasePlugin.groovy
+++ b/gradle/src/main/groovy/com/android/build/gradle/BasePlugin.groovy
@@ -22,8 +22,8 @@ import com.android.build.gradle.internal.ConfigurationDependencies
 import com.android.build.gradle.internal.ManifestDependencyImpl
 import com.android.build.gradle.internal.ProductFlavorData
 import com.android.build.gradle.internal.ProductionAppVariant
+import com.android.build.gradle.internal.SymbolFileProviderImpl
 import com.android.build.gradle.internal.TestAppVariant
-import com.android.build.gradle.internal.TextSymbolProviderImpl
 import com.android.builder.AndroidBuilder
 import com.android.builder.AndroidDependency
 import com.android.builder.BuilderConstants
@@ -33,7 +33,7 @@ import com.android.builder.ManifestDependency
 import com.android.builder.ProductFlavor
 import com.android.builder.SdkParser
 import com.android.builder.SourceProvider
-import com.android.builder.TextSymbolProvider
+import com.android.builder.SymbolFileProvider
 import com.android.builder.VariantConfiguration
 import com.android.utils.ILogger
 import com.google.common.collect.ArrayListMultimap
@@ -891,12 +891,12 @@ abstract class BasePlugin {
         return list
     }
 
-    protected List<TextSymbolProvider> getTextSymbolDependencies(
+    protected List<SymbolFileProvider> getTextSymbolDependencies(
             List<AndroidDependency> libraries) {
-        List<TextSymbolProvider> list = Lists.newArrayListWithCapacity(libraries.size())
+        List<SymbolFileProvider> list = Lists.newArrayListWithCapacity(libraries.size())
 
         for (AndroidDependency lib : libraries) {
-            list.add(new TextSymbolProviderImpl(lib.manifest, lib.textSymbol))
+            list.add(new SymbolFileProviderImpl(lib.manifest, lib.symbolFile))
         }
 
         return list
diff --git a/gradle/src/main/groovy/com/android/build/gradle/ProcessResourcesTask.groovy b/gradle/src/main/groovy/com/android/build/gradle/ProcessResourcesTask.groovy
index a25c650..49a4d49 100644
--- a/gradle/src/main/groovy/com/android/build/gradle/ProcessResourcesTask.groovy
+++ b/gradle/src/main/groovy/com/android/build/gradle/ProcessResourcesTask.groovy
@@ -16,7 +16,7 @@
 package com.android.build.gradle
 
 import com.android.build.gradle.internal.AaptOptionsImpl
-import com.android.builder.TextSymbolProvider
+import com.android.builder.SymbolFileProvider
 import com.android.builder.VariantConfiguration
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.InputDirectory
@@ -43,7 +43,7 @@ class ProcessResourcesTask extends BaseTask {
     File assetsDir
 
     @Nested
-    List<TextSymbolProvider> libraries
+    List<SymbolFileProvider> libraries
 
     @Input @Optional
     String packageOverride
diff --git a/gradle/src/main/groovy/com/android/build/gradle/internal/AndroidDependencyImpl.groovy b/gradle/src/main/groovy/com/android/build/gradle/internal/AndroidDependencyImpl.groovy
index 96482d1..e803fa5 100644
--- a/gradle/src/main/groovy/com/android/build/gradle/internal/AndroidDependencyImpl.groovy
+++ b/gradle/src/main/groovy/com/android/build/gradle/internal/AndroidDependencyImpl.groovy
@@ -17,6 +17,7 @@ package com.android.build.gradle.internal
 
 import com.android.builder.AndroidDependency
 import com.android.builder.BundleDependency
+import com.android.builder.ManifestDependency
 
 class AndroidDependencyImpl extends BundleDependency {
     final List<AndroidDependency> dependencies;
@@ -28,4 +29,9 @@ class AndroidDependencyImpl extends BundleDependency {
         this.dependencies = dependencies
         this.bundle = bundle
     }
+
+    @Override
+    List<ManifestDependency> getManifestDependencies() {
+        return dependencies
+    }
 }
diff --git a/gradle/src/main/groovy/com/android/build/gradle/internal/TextSymbolProviderImpl.java b/gradle/src/main/groovy/com/android/build/gradle/internal/SymbolFileProviderImpl.java
index 5ffd8cf..dbe2af7 100644
--- a/gradle/src/main/groovy/com/android/build/gradle/internal/TextSymbolProviderImpl.java
+++ b/gradle/src/main/groovy/com/android/build/gradle/internal/SymbolFileProviderImpl.java
@@ -16,25 +16,25 @@
 
 package com.android.build.gradle.internal;
 
-import com.android.builder.TextSymbolProvider;
+import com.android.builder.SymbolFileProvider;
 import org.gradle.api.tasks.InputFile;
 
 import java.io.File;
 
 /**
- * Implementation of TextSymbolProvider that can be used as a Task input.
+ * Implementation of SymbolFileProvider that can be used as a Task input.
  */
-public class TextSymbolProviderImpl implements TextSymbolProvider {
+public class SymbolFileProviderImpl implements SymbolFileProvider {
 
     @InputFile
     private File manifest;
 
     @InputFile
-    private File textSymbol;
+    private File symbolFile;
 
-    TextSymbolProviderImpl(File manifest, File textSymbol) {
+    SymbolFileProviderImpl(File manifest, File symbolFile) {
         this.manifest = manifest;
-        this.textSymbol = textSymbol;
+        this.symbolFile = symbolFile;
     }
 
     @Override
@@ -43,7 +43,7 @@ public class TextSymbolProviderImpl implements TextSymbolProvider {
     }
 
     @Override
-    public File getTextSymbol() {
-        return textSymbol;
+    public File getSymbolFile() {
+        return symbolFile;
     }
 }