Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30c22b9c authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Add dist target for robolectric-tests.zip"

parents c3b1a612 cf0e4220

android/test_suites.go

+3 −1
Original line number Diff line number Diff line
@@ -47,10 +47,12 @@ func (t *testSuiteFiles) GenerateBuildActions(ctx SingletonContext) { 
	})



	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 {

java/robolectric.go

+0 −1
Original line number Diff line number Diff line
@@ -366,7 +366,6 @@ func (r *robolectricRuntimes) GenerateAndroidBuildActions(ctx android.ModuleCont 
	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)