diff options
| author | 2024-05-08 22:28:05 +0000 | |
|---|---|---|
| committer | 2024-05-08 22:28:05 +0000 | |
| commit | 7eaf503cfd42a70f625405bb4a4b67eb5de47c8d (patch) | |
| tree | 538010b7947258f555d652310530ccf43905ce72 /apex/apex_test.go | |
| parent | 2aff024c189e5217b102d7b307fddc6c303b1c38 (diff) | |
| parent | a3a05460b478ed59c527dec1c8b2efa61ce9c53c (diff) | |
Merge "Revert^2 "Remove compilation actions from java sdk library"" into main
Diffstat (limited to 'apex/apex_test.go')
| -rw-r--r-- | apex/apex_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apex/apex_test.go b/apex/apex_test.go index a13edbf5e..9a5c2b49b 100644 --- a/apex/apex_test.go +++ b/apex/apex_test.go @@ -7159,7 +7159,7 @@ func TestJavaSDKLibrary_WithinApex(t *testing.T) { // The bar library should depend on the implementation jar. barLibrary := ctx.ModuleForTests("bar", "android_common_myapex").Rule("javac") - if expected, actual := `^-classpath [^:]*/turbine-combined/foo\.impl\.jar$`, barLibrary.Args["classpath"]; !regexp.MustCompile(expected).MatchString(actual) { + if expected, actual := `^-classpath [^:]*/turbine-combined/foo\.jar$`, barLibrary.Args["classpath"]; !regexp.MustCompile(expected).MatchString(actual) { t.Errorf("expected %q, found %#q", expected, actual) } } @@ -7300,7 +7300,7 @@ func TestJavaSDKLibrary_ImportPreferred(t *testing.T) { // The bar library should depend on the implementation jar. barLibrary := ctx.ModuleForTests("bar", "android_common_myapex").Rule("javac") - if expected, actual := `^-classpath [^:]*/turbine-combined/foo\.impl\.jar$`, barLibrary.Args["classpath"]; !regexp.MustCompile(expected).MatchString(actual) { + if expected, actual := `^-classpath [^:]*/turbine-combined/foo\.jar$`, barLibrary.Args["classpath"]; !regexp.MustCompile(expected).MatchString(actual) { t.Errorf("expected %q, found %#q", expected, actual) } } |