diff options
| author | 2019-12-03 21:19:12 +0000 | |
|---|---|---|
| committer | 2019-12-03 21:19:12 +0000 | |
| commit | dc9369ef7fc9c971a59d6586adf02a69e7dfdec7 (patch) | |
| tree | 62b338a4a063f4194ed0201f0acbfbbef6f187d9 /rust/androidmk.go | |
| parent | 4d2eeed0dad64b14c9fd8641ff304ac40cd17fe6 (diff) | |
| parent | ede57ae8122992e788be7977803926e76e35b466 (diff) | |
Merge "Generate tradefed config for rust device tests."
Diffstat (limited to 'rust/androidmk.go')
| -rw-r--r-- | rust/androidmk.go | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/rust/androidmk.go b/rust/androidmk.go index edd5c5f88..2636d97f5 100644 --- a/rust/androidmk.go +++ b/rust/androidmk.go @@ -90,11 +90,7 @@ func (binary *binaryDecorator) AndroidMk(ctx AndroidMkContext, ret *android.Andr func (test *testDecorator) AndroidMk(ctx AndroidMkContext, ret *android.AndroidMkData) { test.binaryDecorator.AndroidMk(ctx, ret) ret.Class = "NATIVE_TESTS" - stem := String(test.baseCompiler.Properties.Stem) - if stem != "" && !strings.HasSuffix(ctx.Name(), "_"+stem) { - // Avoid repeated suffix in the module name. - ret.SubName = "_" + stem - } + ret.SubName = test.getMutatedModuleSubName(ctx.Name()) ret.Extra = append(ret.Extra, func(w io.Writer, outputFile android.Path) { if len(test.Properties.Test_suites) > 0 { fmt.Fprintln(w, "LOCAL_COMPATIBILITY_SUITE :=", |