Revert "Support filegroup in exclude_srcs"
This reverts commit f36a3d9b6da654bf8bd7a49315b1625cf0e774ce.
Reason for revert: Broke several builds. I'm acting build cop, reverting.
Bug: 70351683
Change-Id: I775ada4e9cb6473519d51420b41b818af163da44
diff --git a/java/java_test.go b/java/java_test.go
index 19c5f21..60d9a40 100644
--- a/java/java_test.go
+++ b/java/java_test.go
@@ -131,19 +131,16 @@
}
mockFS := map[string][]byte{
- "Android.bp": []byte(bp),
- "a.java": nil,
- "b.java": nil,
- "c.java": nil,
- "b.kt": nil,
- "a.jar": nil,
- "b.jar": nil,
- "java-res/a": nil,
- "java-res/b": nil,
- "java-res2/a": nil,
- "java-fg/a.java": nil,
- "java-fg/b.java": nil,
- "java-fg/c.java": nil,
+ "Android.bp": []byte(bp),
+ "a.java": nil,
+ "b.java": nil,
+ "c.java": nil,
+ "b.kt": nil,
+ "a.jar": nil,
+ "b.jar": nil,
+ "java-res/a": nil,
+ "java-res/b": nil,
+ "java-res2/a": nil,
"prebuilts/sdk/14/android.jar": nil,
"prebuilts/sdk/14/framework.aidl": nil,
@@ -910,32 +907,6 @@
}
}
-func TestExcludeFileGroupInSrcs(t *testing.T) {
- ctx := testJava(t, `
- java_library {
- name: "foo",
- srcs: ["a.java", ":foo-srcs"],
- exclude_srcs: ["a.java", ":foo-excludes"],
- }
-
- filegroup {
- name: "foo-srcs",
- srcs: ["java-fg/a.java", "java-fg/b.java", "java-fg/c.java"],
- }
-
- filegroup {
- name: "foo-excludes",
- srcs: ["java-fg/a.java", "java-fg/b.java"],
- }
- `)
-
- javac := ctx.ModuleForTests("foo", "android_common").Rule("javac")
-
- if len(javac.Inputs) != 1 || javac.Inputs[0].String() != "java-fg/c.java" {
- t.Errorf(`foo inputs %v != ["java-fg/c.java"]`, javac.Inputs)
- }
-}
-
func fail(t *testing.T, errs []error) {
t.Helper()
if len(errs) > 0 {