diff options
Diffstat (limited to 'cc/test_data_test.go')
| -rw-r--r-- | cc/test_data_test.go | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/cc/test_data_test.go b/cc/test_data_test.go index 9b5a85a76..a798919f8 100644 --- a/cc/test_data_test.go +++ b/cc/test_data_test.go @@ -131,8 +131,10 @@ func TestDataTests(t *testing.T) { "dir/baz": nil, "dir/bar/baz": nil, }) - ctx.RegisterModuleType("filegroup", genrule.FileGroupFactory) - ctx.RegisterModuleType("test", newTest) + ctx.RegisterModuleType("filegroup", + android.ModuleFactoryAdaptor(genrule.FileGroupFactory)) + ctx.RegisterModuleType("test", + android.ModuleFactoryAdaptor(newTest)) _, errs := ctx.ParseBlueprintsFiles("Blueprints") fail(t, errs) @@ -175,9 +177,11 @@ type testDataTest struct { } } -func newTest() (blueprint.Module, []interface{}) { +func newTest() android.Module { m := &testDataTest{} - return android.InitAndroidModule(m, &m.Properties) + m.AddProperties(&m.Properties) + android.InitAndroidModule(m) + return m } func (test *testDataTest) DepsMutator(ctx android.BottomUpMutatorContext) { |