From 9da4aa8166efe67d6c4ab1fe7911224d94493cc9 Mon Sep 17 00:00:00 2001 From: Ivan Lozano Date: Fri, 29 Jan 2021 12:48:05 -0500 Subject: rust: Allow rust_tests to include data files. Adds the ability to define data files that should be installed alongside the test. This also fixes a bug wherein rust_test properties were duplicated. Bug: 171710847 Test: rust_test module with "data" property installs files to device. Change-Id: I091489afaf7e76b751a33a28049590d9fb39fe5f --- rust/androidmk.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'rust/androidmk.go') diff --git a/rust/androidmk.go b/rust/androidmk.go index 030772722..1a286f738 100644 --- a/rust/androidmk.go +++ b/rust/androidmk.go @@ -18,6 +18,7 @@ import ( "path/filepath" "android/soong/android" + "android/soong/cc" ) type AndroidMkContext interface { @@ -85,7 +86,8 @@ func (binary *binaryDecorator) AndroidMk(ctx AndroidMkContext, ret *android.Andr } func (test *testDecorator) AndroidMk(ctx AndroidMkContext, ret *android.AndroidMkEntries) { - test.binaryDecorator.AndroidMk(ctx, ret) + ctx.SubAndroidMk(ret, test.binaryDecorator) + ret.Class = "NATIVE_TESTS" ret.ExtraEntries = append(ret.ExtraEntries, func(entries *android.AndroidMkEntries) { entries.AddCompatibilityTestSuites(test.Properties.Test_suites...) @@ -95,7 +97,8 @@ func (test *testDecorator) AndroidMk(ctx AndroidMkContext, ret *android.AndroidM entries.SetBoolIfTrue("LOCAL_DISABLE_AUTO_GENERATE_TEST_CONFIG", !BoolDefault(test.Properties.Auto_gen_config, true)) entries.SetBoolIfTrue("LOCAL_IS_UNIT_TEST", Bool(test.Properties.Test_options.Unit_test)) }) - // TODO(chh): add test data with androidMkWriteTestData(test.data, ctx, ret) + + cc.AndroidMkWriteTestData(test.data, ret) } func (library *libraryDecorator) AndroidMk(ctx AndroidMkContext, ret *android.AndroidMkEntries) { -- cgit v1.2.3-59-g8ed1b