Merge "Export test/benchmark factory symbols."

This commit is contained in:
Treehugger Robot
2017-11-04 02:59:00 +00:00
committed by Gerrit Code Review

View File

@@ -47,39 +47,39 @@ type TestBinaryProperties struct {
} }
func init() { func init() {
android.RegisterModuleType("cc_test", testFactory) android.RegisterModuleType("cc_test", TestFactory)
android.RegisterModuleType("cc_test_library", testLibraryFactory) android.RegisterModuleType("cc_test_library", TestLibraryFactory)
android.RegisterModuleType("cc_benchmark", benchmarkFactory) android.RegisterModuleType("cc_benchmark", BenchmarkFactory)
android.RegisterModuleType("cc_test_host", testHostFactory) android.RegisterModuleType("cc_test_host", TestHostFactory)
android.RegisterModuleType("cc_benchmark_host", benchmarkHostFactory) android.RegisterModuleType("cc_benchmark_host", BenchmarkHostFactory)
} }
// Module factory for tests // Module factory for tests
func testFactory() android.Module { func TestFactory() android.Module {
module := NewTest(android.HostAndDeviceSupported) module := NewTest(android.HostAndDeviceSupported)
return module.Init() return module.Init()
} }
// Module factory for test libraries // Module factory for test libraries
func testLibraryFactory() android.Module { func TestLibraryFactory() android.Module {
module := NewTestLibrary(android.HostAndDeviceSupported) module := NewTestLibrary(android.HostAndDeviceSupported)
return module.Init() return module.Init()
} }
// Module factory for benchmarks // Module factory for benchmarks
func benchmarkFactory() android.Module { func BenchmarkFactory() android.Module {
module := NewBenchmark(android.HostAndDeviceSupported) module := NewBenchmark(android.HostAndDeviceSupported)
return module.Init() return module.Init()
} }
// Module factory for host tests // Module factory for host tests
func testHostFactory() android.Module { func TestHostFactory() android.Module {
module := NewTest(android.HostSupported) module := NewTest(android.HostSupported)
return module.Init() return module.Init()
} }
// Module factory for host benchmarks // Module factory for host benchmarks
func benchmarkHostFactory() android.Module { func BenchmarkHostFactory() android.Module {
module := NewBenchmark(android.HostSupported) module := NewBenchmark(android.HostSupported)
return module.Init() return module.Init()
} }