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

Merge "Add dist target for robolectric-tests.zip" am: 30c22b9c7a

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1367538

Change-Id: I5e70cd5c1e9d256c762246fbda0d4f213bab421a
This commit is contained in:
Treehugger Robot
2020-07-21 02:17:51 +00:00
committed by Automerger Merge Worker
parent e1c5693a72 30c22b9c7a
commit e45c3b1c6a
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"])
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 {

1
java/robolectric.go
View File

@@ -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)