summaryrefslogtreecommitdiff
path: root/java/androidmk.go
diff options
context:
space:
mode:
author Julien Desprez <jdesprez@google.com> 2018-08-02 15:00:46 -0700
committer Julien Desprez <jdesprez@google.com> 2018-08-07 15:51:21 -0700
commite146e39fa6852d66f20c6140784086ce23858e84 (patch)
tree02745294183104aeb4a30e4106cdb9503b848eb0 /java/androidmk.go
parent6bfe4eb42c79d4930a71ba5ad013177b1741713f (diff)
Support 'test_config' into soong modules
Test: make general-tests Bug: 110982517 Change-Id: Ib2eab2653fdfce6f699b85c9fbc64558b6d40363
Diffstat (limited to 'java/androidmk.go')
-rw-r--r--java/androidmk.go8
1 files changed, 8 insertions, 0 deletions
diff --git a/java/androidmk.go b/java/androidmk.go
index 40711f627..14e9fec92 100644
--- a/java/androidmk.go
+++ b/java/androidmk.go
@@ -107,6 +107,10 @@ func (j *Test) AndroidMk() android.AndroidMkData {
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 @@ func (a *AndroidTest) AndroidMk() android.AndroidMkData {
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