Merge changes I406c5bef,Ibde685d7,I1c09412d,I9bec563c,I34f06abd into pi-dev
* changes: Allow VNDK extensions under vendor or device Add unit tests for android/neverallow.go Extract failIfErrored() to android/testing.go RemoveFromList() should remove all matches Add unit tests for android/util.go
This commit is contained in:
@@ -190,9 +190,9 @@ func testContext(config android.Config, bp string,
|
||||
func run(t *testing.T, ctx *android.TestContext, config android.Config) {
|
||||
t.Helper()
|
||||
_, errs := ctx.ParseFileList(".", []string{"Android.bp"})
|
||||
fail(t, errs)
|
||||
android.FailIfErrored(t, errs)
|
||||
_, errs = ctx.PrepareBuildActions(config)
|
||||
fail(t, errs)
|
||||
android.FailIfErrored(t, errs)
|
||||
}
|
||||
|
||||
func testJava(t *testing.T, bp string) *android.TestContext {
|
||||
@@ -977,13 +977,3 @@ func TestExcludeFileGroupInSrcs(t *testing.T) {
|
||||
t.Errorf(`foo inputs %v != ["java-fg/c.java"]`, javac.Inputs)
|
||||
}
|
||||
}
|
||||
|
||||
func fail(t *testing.T, errs []error) {
|
||||
t.Helper()
|
||||
if len(errs) > 0 {
|
||||
for _, err := range errs {
|
||||
t.Error(err)
|
||||
}
|
||||
t.FailNow()
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user