From ede57ae8122992e788be7977803926e76e35b466 Mon Sep 17 00:00:00 2001 From: Chih-Hung Hsieh Date: Fri, 22 Nov 2019 20:22:35 -0800 Subject: Generate tradefed config for rust device tests. * The RustBinaryTest runner and device test config template are derived from GTest. Device tests are pushed to /data/local/tmp. Bug: 140938178 Test: make unicode-xid projects; run atest Change-Id: Idb4cab7872b48c6e25bc59b85aa6d9dece4383ec --- rust/androidmk.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'rust/androidmk.go') 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 :=", -- cgit v1.2.3-59-g8ed1b