Merge "Drop strings.HasPrefix
when guarding strings.TrimPrefix
." am: 7beb099546
am: cdaf15d04f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1765983 Change-Id: Ie6342e568e443a13eb840afb218dbb5a3931467d
This commit is contained in:
committed by
Automerger Merge Worker
commit
732d7c431a
@@ -179,7 +179,7 @@ func (r *robolectricTest) GenerateAndroidBuildActions(ctx android.ModuleContext)
|
||||
continue
|
||||
} else if strings.HasSuffix(s, "/BaseRobolectricTest.java") {
|
||||
continue
|
||||
} else if strings.HasPrefix(s, "src/") {
|
||||
} else {
|
||||
s = strings.TrimPrefix(s, "src/")
|
||||
}
|
||||
r.tests = append(r.tests, s)
|
||||
|
Reference in New Issue
Block a user