Removed getAllJava and getAllResources unused APIs.
Change-Id: I5578c19856f4f2ebf851571e8fcfc58c58fda8cb
(cherry picked from commit 484ac862ccb0838c5c93583b9c8499ed0f15092c)
diff --git a/build-system/gradle/src/main/groovy/com/android/build/gradle/api/AndroidSourceSet.groovy b/build-system/gradle/src/main/groovy/com/android/build/gradle/api/AndroidSourceSet.groovy
index 7dda9ac..251d29d 100644
--- a/build-system/gradle/src/main/groovy/com/android/build/gradle/api/AndroidSourceSet.groovy
+++ b/build-system/gradle/src/main/groovy/com/android/build/gradle/api/AndroidSourceSet.groovy
@@ -75,23 +75,6 @@
AndroidSourceSet java(Closure configureClosure);
/**
- * All Java source files for this source set. This includes, for example, source which is
- * directly compiled, and source which is indirectly compiled through joint compilation.
- *
- * @return the Java source. Never returns null.
- */
- @NonNull
- AndroidSourceDirectorySet getAllJava();
-
- /**
- * All source files for this source set.
- *
- * @return the source. Never returns null.
- */
- @NonNull
- AndroidSourceDirectorySet getAllSource();
-
- /**
* Returns the name of the compile configuration for this source set.
* @return The configuration name
*/
diff --git a/build-system/gradle/src/main/groovy/com/android/build/gradle/internal/SourceSetSourceProviderWrapper.java b/build-system/gradle/src/main/groovy/com/android/build/gradle/internal/SourceSetSourceProviderWrapper.java
index 737edc0..f3ac7bd 100644
--- a/build-system/gradle/src/main/groovy/com/android/build/gradle/internal/SourceSetSourceProviderWrapper.java
+++ b/build-system/gradle/src/main/groovy/com/android/build/gradle/internal/SourceSetSourceProviderWrapper.java
@@ -54,7 +54,7 @@
@NonNull
@Override
public Collection<File> getJavaDirectories() {
- return sourceSet.getAllJava().getSrcDirs();
+ return sourceSet.getJava().getSrcDirs();
}
@NonNull
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 7a8557c..9905d60 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
@@ -260,11 +260,6 @@
return this;
}
- @Override
- @NonNull
- public AndroidSourceDirectorySet getAllJava() {
- return allJavaSource;
- }
@Override
@NonNull
@@ -281,12 +276,6 @@
@Override
@NonNull
- public AndroidSourceDirectorySet getAllSource() {
- return allSource;
- }
-
- @Override
- @NonNull
public AndroidSourceSet setRoot(String path) {
javaSource.setSrcDirs(Collections.singletonList(path + "/java"));
javaResources.setSrcDirs(Collections.singletonList(path + "/resources"));
