Support 'test_config' into soong modules
Test: make general-tests
Bug: 110982517
Change-Id: Ib2eab2653fdfce6f699b85c9fbc64558b6d40363
diff --git a/java/androidmk.go b/java/androidmk.go
index 40711f6..14e9fec 100644
--- a/java/androidmk.go
+++ b/java/androidmk.go
@@ -107,6 +107,10 @@
fmt.Fprintln(w, "LOCAL_COMPATIBILITY_SUITE :=",
strings.Join(j.testProperties.Test_suites, " "))
}
+ if j.testProperties.Test_config != nil {
+ fmt.Fprintln(w, "LOCAL_TEST_CONFIG :=",
+ *j.testProperties.Test_config)
+ }
})
return data
@@ -241,6 +245,10 @@
fmt.Fprintln(w, "LOCAL_COMPATIBILITY_SUITE :=",
strings.Join(a.testProperties.Test_suites, " "))
}
+ if a.testProperties.Test_config != nil {
+ fmt.Fprintln(w, "LOCAL_TEST_CONFIG :=",
+ *a.testProperties.Test_config)
+ }
})
return data
diff --git a/java/java.go b/java/java.go
index 38c89f4..700b917 100644
--- a/java/java.go
+++ b/java/java.go
@@ -1352,6 +1352,10 @@
// list of compatibility suites (for example "cts", "vts") that the module should be
// installed into.
Test_suites []string `android:"arch_variant"`
+
+ // the name of the test configuration (for example "AndroidTest.xml") that should be
+ // installed with the module.
+ Test_config *string `android:"arch_variant"`
}
type Test struct {