diff options
| author | Jerome Dochez <jedo@google.com> | 2014-06-26 04:38:21 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-06-26 04:38:21 +0000 |
| commit | 8162fdf759da58a2b9fd098fd2cb1484f985914d (patch) | |
| tree | b81e3b644e6182b73b810d335734efe02eeda467 | |
| parent | 865614ace00a8db3bf1a158d23844d693b698e9f (diff) | |
| parent | 6facd9879d7d658ca5cbeae1f9fad0cb99e05dfc (diff) | |
| download | base-8162fdf759da58a2b9fd098fd2cb1484f985914d.tar.gz | |
Merge "Removed unused instance variables" into idea133
automerge: 6facd98
* commit '6facd9879d7d658ca5cbeae1f9fad0cb99e05dfc':
Removed unused instance variables
| -rw-r--r-- | build-system/gradle/src/main/groovy/com/android/build/gradle/internal/api/DefaultAndroidSourceSet.java | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/build-system/gradle/src/main/groovy/com/android/build/gradle/internal/api/DefaultAndroidSourceSet.java b/build-system/gradle/src/main/groovy/com/android/build/gradle/internal/api/DefaultAndroidSourceSet.java index 9905d60903..6c164bc97d 100644 --- a/build-system/gradle/src/main/groovy/com/android/build/gradle/internal/api/DefaultAndroidSourceSet.java +++ b/build-system/gradle/src/main/groovy/com/android/build/gradle/internal/api/DefaultAndroidSourceSet.java @@ -24,8 +24,6 @@ import com.android.build.gradle.api.AndroidSourceSet; import com.android.builder.model.SourceProvider; import org.gradle.api.Project; -import org.gradle.api.file.SourceDirectorySet; -import org.gradle.api.internal.file.DefaultSourceDirectorySet; import org.gradle.api.tasks.SourceSet; import org.gradle.util.ConfigureUtil; import org.gradle.util.GUtil; @@ -45,7 +43,6 @@ public class DefaultAndroidSourceSet implements AndroidSourceSet, SourceProvider private final boolean isLibrary; private final AndroidSourceDirectorySet javaSource; - private final AndroidSourceDirectorySet allJavaSource; private final AndroidSourceDirectorySet javaResources; private final AndroidSourceFile manifest; private final AndroidSourceDirectorySet assets; @@ -55,7 +52,6 @@ public class DefaultAndroidSourceSet implements AndroidSourceSet, SourceProvider private final AndroidSourceDirectorySet jni; private final AndroidSourceDirectorySet jniLibs; private final String displayName; - private final AndroidSourceDirectorySet allSource; public DefaultAndroidSourceSet(@NonNull String name, Project project, boolean isLibrary) { @@ -68,18 +64,10 @@ public class DefaultAndroidSourceSet implements AndroidSourceSet, SourceProvider javaSource = new DefaultAndroidSourceDirectorySet(javaSrcDisplayName, project); javaSource.getFilter().include("**/*.java"); - allJavaSource = new DefaultAndroidSourceDirectorySet(javaSrcDisplayName, project); - allJavaSource.getFilter().include("**/*.java"); - allJavaSource.srcDirs(javaSource); - String javaResourcesDisplayName = String.format("%s Java resources", displayName); javaResources = new DefaultAndroidSourceDirectorySet(javaResourcesDisplayName, project); javaResources.getFilter().exclude("**/*.java"); - String allSourceDisplayName = String.format("%s source", displayName); - allSource = new DefaultAndroidSourceDirectorySet(allSourceDisplayName, project); - allSource.srcDirs(javaResources, javaSource); - String manifestDisplayName = String.format("%s manifest", displayName); manifest = new DefaultAndroidSourceFile(manifestDisplayName, project); |