Add dist target for robolectric-tests.zip
Also remove stray fmt.Println.
Test: m robolectric-tests
Change-Id: Ia463c2b395fadd6ab33b2ce8364f2119b2a2be1e
diff --git a/android/test_suites.go b/android/test_suites.go
index b6ca0e6..7b2d7dc 100644
--- a/android/test_suites.go
+++ b/android/test_suites.go
@@ -47,10 +47,12 @@
})
t.robolectric = robolectricTestSuite(ctx, files["robolectric-tests"])
+
+ ctx.Phony("robolectric-tests", t.robolectric)
}
func (t *testSuiteFiles) MakeVars(ctx MakeVarsContext) {
- ctx.Strict("ROBOLECTRIC_TEST_SUITE", t.robolectric.String())
+ ctx.DistForGoal("robolectric-tests", t.robolectric)
}
func robolectricTestSuite(ctx SingletonContext, files map[string]InstallPaths) WritablePath {
diff --git a/java/robolectric.go b/java/robolectric.go
index 85d1bef..4d68fd9 100644
--- a/java/robolectric.go
+++ b/java/robolectric.go
@@ -366,7 +366,6 @@
files := android.PathsForModuleSrc(ctx, r.props.Jars)
androidAllDir := android.PathForModuleInstall(ctx, "android-all")
- fmt.Println(androidAllDir.String())
for _, from := range files {
installedRuntime := ctx.InstallFile(androidAllDir, from.Base(), from)
r.runtimes = append(r.runtimes, installedRuntime)