diff options
| -rw-r--r-- | cc/test.go | 4 | ||||
| -rw-r--r-- | java/java.go | 1 | ||||
| -rw-r--r-- | java/robolectric.go | 3 | ||||
| -rw-r--r-- | ui/build/cleanbuild.go | 1 |
4 files changed, 8 insertions, 1 deletions
diff --git a/cc/test.go b/cc/test.go index 1a0d44fd6..a5a368071 100644 --- a/cc/test.go +++ b/cc/test.go @@ -317,6 +317,10 @@ func (test *testBinary) install(ctx ModuleContext, file android.Path) { var configs []tradefed.Config if Bool(test.Properties.Require_root) { configs = append(configs, tradefed.Preparer{"com.android.tradefed.targetprep.RootTargetPreparer", nil}) + } else { + var options []tradefed.Option + options = append(options, tradefed.Option{"force-root", "false"}) + configs = append(configs, tradefed.Preparer{"com.android.tradefed.targetprep.RootTargetPreparer", options}) } if Bool(test.Properties.Disable_framework) { var options []tradefed.Option diff --git a/java/java.go b/java/java.go index b05d7bbd5..b0fc9db6c 100644 --- a/java/java.go +++ b/java/java.go @@ -398,6 +398,7 @@ type Dependency interface { AidlIncludeDirs() android.Paths ExportedSdkLibs() []string SrcJarArgs() ([]string, android.Paths) + BaseModuleName() string } type SdkLibraryDependency interface { diff --git a/java/robolectric.go b/java/robolectric.go index cbe3557bc..9669e1b38 100644 --- a/java/robolectric.go +++ b/java/robolectric.go @@ -105,7 +105,7 @@ func (r *robolectricTest) GenerateAndroidBuildActions(ctx android.ModuleContext) r.roboSrcJar = roboSrcJar for _, dep := range ctx.GetDirectDepsWithTag(libTag) { - r.libs = append(r.libs, ctx.OtherModuleName(dep)) + r.libs = append(r.libs, dep.(Dependency).BaseModuleName()) } // TODO: this could all be removed if tradefed was used as the test runner, it will find everything @@ -233,6 +233,7 @@ func RobolectricTestFactory() android.Module { module.AddProperties( &module.Module.properties, + &module.Module.deviceProperties, &module.Module.protoProperties, &module.robolectricProperties) diff --git a/ui/build/cleanbuild.go b/ui/build/cleanbuild.go index bfe2c36e4..0a2b51065 100644 --- a/ui/build/cleanbuild.go +++ b/ui/build/cleanbuild.go @@ -87,6 +87,7 @@ func installClean(ctx Context, config Config, what int) { // otherwise we'd have to rebuild any generated files created with // those tools. removeGlobs(ctx, + hostOut("apex"), hostOut("obj/NOTICE_FILES"), hostOut("obj/PACKAGING"), hostOut("coverage"), |