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

Merge "Don't assume host arch is always x86"

Browse Source
This commit is contained in:
Treehugger Robot
2020-09-09 00:13:50 +00:00
committed by Gerrit Code Review
parent f8123919aa 87788b5247
commit daf735287b
6 changed files with 54 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
java/robolectric.go
View File

@@ -326,9 +326,11 @@ func RobolectricTestFactory() android.Module {
return module
}
func (r *robolectricTest) InstallBypassMake() bool { return true }
func (r *robolectricTest) InstallInTestcases() bool { return true }
func (r *robolectricTest) InstallForceOS() *android.OsType { return &android.BuildOs }
func (r *robolectricTest) InstallBypassMake() bool { return true }
func (r *robolectricTest) InstallInTestcases() bool { return true }
func (r *robolectricTest) InstallForceOS() (*android.OsType, *android.ArchType) {
return &android.BuildOs, &android.BuildArch
}
func robolectricRuntimesFactory() android.Module {
module := &robolectricRuntimes{}
@@ -390,6 +392,8 @@ func (r *robolectricRuntimes) GenerateAndroidBuildActions(ctx android.ModuleCont
}
}
func (r *robolectricRuntimes) InstallBypassMake() bool { return true }
func (r *robolectricRuntimes) InstallInTestcases() bool { return true }
func (r *robolectricRuntimes) InstallForceOS() *android.OsType { return &android.BuildOs }
func (r *robolectricRuntimes) InstallBypassMake() bool { return true }
func (r *robolectricRuntimes) InstallInTestcases() bool { return true }
func (r *robolectricRuntimes) InstallForceOS() (*android.OsType, *android.ArchType) {
return &android.BuildOs, &android.BuildArch
}