diff options
Diffstat (limited to 'java/robolectric.go')
| -rw-r--r-- | java/robolectric.go | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/java/robolectric.go b/java/robolectric.go index ec112bc99..04fc11722 100644 --- a/java/robolectric.go +++ b/java/robolectric.go @@ -31,7 +31,6 @@ func init() { } var robolectricDefaultLibs = []string{ - "robolectric_android-all-stub", "Robolectric_all-target", "mockito-robolectric-prebuilt", "truth-prebuilt", @@ -99,7 +98,8 @@ func (r *robolectricTest) DepsMutator(ctx android.BottomUpMutatorContext) { ctx.AddVariationDependencies(nil, roboCoverageLibsTag, r.robolectricProperties.Coverage_libs...) - ctx.AddVariationDependencies(nil, roboRuntimesTag, "robolectric-android-all-prebuilts") + ctx.AddFarVariationDependencies(ctx.Config().BuildOSCommonTarget.Variations(), + roboRuntimesTag, "robolectric-android-all-prebuilts") } func (r *robolectricTest) GenerateAndroidBuildActions(ctx android.ModuleContext) { @@ -335,7 +335,7 @@ func (r *robolectricTest) InstallForceOS() (*android.OsType, *android.ArchType) func robolectricRuntimesFactory() android.Module { module := &robolectricRuntimes{} module.AddProperties(&module.props) - android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibCommon) + android.InitAndroidArchModule(module, android.HostSupportedNoCross, android.MultilibCommon) return module } @@ -365,6 +365,10 @@ func (r *robolectricRuntimes) DepsMutator(ctx android.BottomUpMutatorContext) { } func (r *robolectricRuntimes) GenerateAndroidBuildActions(ctx android.ModuleContext) { + if ctx.Target().Os != ctx.Config().BuildOSCommonTarget.Os { + return + } + files := android.PathsForModuleSrc(ctx, r.props.Jars) androidAllDir := android.PathForModuleInstall(ctx, "android-all") |