StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add dist target for robolectric-tests.zip

Browse Source 
Also remove stray fmt.Println.

Test: m robolectric-tests
Change-Id: Ia463c2b395fadd6ab33b2ce8364f2119b2a2be1e
This commit is contained in:
Colin Cross
2020-07-20 17:19:02 -07:00
parent f0ba57bf33
commit cf0e4220eb
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/test_suites.go
View File

@@ -47,10 +47,12 @@ func (t *testSuiteFiles) GenerateBuildActions(ctx SingletonContext) {
}) })
t.robolectric = robolectricTestSuite(ctx, files["robolectric-tests"]) t.robolectric = robolectricTestSuite(ctx, files["robolectric-tests"])
ctx.Phony("robolectric-tests", t.robolectric)
} }
func (t *testSuiteFiles) MakeVars(ctx MakeVarsContext) { 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 { func robolectricTestSuite(ctx SingletonContext, files map[string]InstallPaths) WritablePath {

1
java/robolectric.go
View File

@@ -366,7 +366,6 @@ func (r *robolectricRuntimes) GenerateAndroidBuildActions(ctx android.ModuleCont
files := android.PathsForModuleSrc(ctx, r.props.Jars) files := android.PathsForModuleSrc(ctx, r.props.Jars)
androidAllDir := android.PathForModuleInstall(ctx, "android-all") androidAllDir := android.PathForModuleInstall(ctx, "android-all")
fmt.Println(androidAllDir.String())
for _, from := range files { for _, from := range files {
installedRuntime := ctx.InstallFile(androidAllDir, from.Base(), from) installedRuntime := ctx.InstallFile(androidAllDir, from.Base(), from)
r.runtimes = append(r.runtimes, installedRuntime) r.runtimes = append(r.runtimes, installedRuntime)