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

Merge "Add phony name for robolectric tests" am: ffe2c918e9 am: 11a32a918b am: 7c26a0cc17 am: 424be4ecef am: 19673f3632

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

Change-Id: If2cacb7c3a0c004946dc0f0c5d7fe5dbb1750c4a
This commit is contained in:
Colin Cross
2021-09-24 21:12:18 +00:00
committed by Automerger Merge Worker
parent c02fce3d60 19673f3632
commit e960435684
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
java/robolectric.go
View File

@@ -212,7 +212,13 @@ func (r *robolectricTest) GenerateAndroidBuildActions(ctx android.ModuleContext)
installDeps = append(installDeps, installedData)
}
ctx.InstallFile(installPath, ctx.ModuleName()+".jar", r.combinedJar, installDeps...)
installed := ctx.InstallFile(installPath, ctx.ModuleName()+".jar", r.combinedJar, installDeps...)
if r.ExportedToMake() {
// Soong handles installation here, but Make is usually what creates the phony rule that atest
// uses to build the module. Create it here for now.
ctx.Phony(ctx.ModuleName(), installed)
}
}
func generateRoboTestConfig(ctx android.ModuleContext, outputFile android.WritablePath,