StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Convert TestClasspath to test fixtures"

Browse Source
This commit is contained in:
Paul Duffin
2021-03-19 11:08:17 +00:00
committed by Gerrit Code Review
parent b1672af5d2 76101fa5ec
commit 903a8a08ab
2 changed files with 47 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
java/java_test.go
View File

@@ -245,7 +245,14 @@ func moduleToPath(name string) string {
// defaultModuleToPath constructs a path to the turbine generate jar for a default test module that
// is defined in PrepareForIntegrationTestWithJava
func defaultModuleToPath(name string) string {
return filepath.Join(buildDir, ".intermediates", defaultJavaDir, name, "android_common", "turbine-combined", name+".jar")
switch {
case name == `""`:
return name
case strings.HasSuffix(name, ".jar"):
return name
default:
return filepath.Join(buildDir, ".intermediates", defaultJavaDir, name, "android_common", "turbine-combined", name+".jar")
}
}
func TestJavaLinkType(t *testing.T) {