test_module_config for sh_test

Implemented test_module_config for sh_tests.
There are some shell tests that have 130 cc_binaries and they get
duplicated in the vts .zip.  test_module_config allows deduping for
lowmem and hwasan use cases freeing a 1 G in the zip.

Moved some of the knowledge about constructing the make rules back to
the provider.

I haven't tried this for cc_test or rust_test, but I think it will be
similar to sh_test if we ever need it.
There is currently only one usecase for using test_module_config with
sh_test (and none for cc_ or rust_)

Also added "extra_test_configs" to sh_test

Sample bp file.

test_module_config {
    name: "vts_ltp_tmc",
    base: "vts_ltp_test_x86_64",
    test_suites: [
         "general-tests",
	 "vts"
    ],
    options: [
        {name: "is-low-mem", value: "false"},
        {name: "is-hwasan", value: "true"},
    ],
}

Test: go test ./
Test: m vts_ltp_test_x86_64_hwasan
Test: atest vts_ltp_test_x86_64_hwasan
Test: m vts  # inspect the zip for symlinks
Test: CtsAppTestCases_android_server_am
Test: atest -c -v vts_ltp_test_x86_64:vts_ltp_test_x86_64_hwa

Change-Id: I5a36d798fd21180d653d09e54f40449a0ebcbd29

1 files changed, 10 insertions, 8 deletions

diff --git a/java/java.go b/java/java.go
index 53b3481d0..fff902fa1 100644
--- a/java/java.go
+++ b/java/java.go
@@ -1559,14 +1559,16 @@ func (j *TestHost) GenerateAndroidBuildActions(ctx android.ModuleContext) {
 
 	j.Test.generateAndroidBuildActionsWithConfig(ctx, configs)
 	android.SetProvider(ctx, tradefed.BaseTestProviderKey, tradefed.BaseTestProviderData{
-		InstalledFiles:      j.data,
-		OutputFile:          j.outputFile,
-		TestConfig:          j.testConfig,
-		RequiredModuleNames: j.RequiredModuleNames(ctx),
-		TestSuites:          j.testProperties.Test_suites,
-		IsHost:              true,
-		LocalSdkVersion:     j.sdkVersion.String(),
-		IsUnitTest:          Bool(j.testProperties.Test_options.Unit_test),
+		TestcaseRelDataFiles: testcaseRel(j.data),
+		OutputFile:           j.outputFile,
+		TestConfig:           j.testConfig,
+		RequiredModuleNames:  j.RequiredModuleNames(ctx),
+		TestSuites:           j.testProperties.Test_suites,
+		IsHost:               true,
+		LocalSdkVersion:      j.sdkVersion.String(),
+		IsUnitTest:           Bool(j.testProperties.Test_options.Unit_test),
+		MkInclude:            "$(BUILD_SYSTEM)/soong_java_prebuilt.mk",
+		MkAppClass:           "JAVA_LIBRARIES",
 	})
 }