summaryrefslogtreecommitdiff
path: root/python/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 /python/androidmk.go
parent6bfe4eb42c79d4930a71ba5ad013177b1741713f (diff)
Support 'test_config' into soong modules
Test: make general-tests Bug: 110982517 Change-Id: Ib2eab2653fdfce6f699b85c9fbc64558b6d40363
Diffstat (limited to 'python/androidmk.go')
-rw-r--r--python/androidmk.go5
1 files changed, 5 insertions, 0 deletions
diff --git a/python/androidmk.go b/python/androidmk.go
index 365b422f5..20861cb8e 100644
--- a/python/androidmk.go
+++ b/python/androidmk.go
@@ -66,6 +66,11 @@ func (p *testDecorator) AndroidMk(base *Module, ret *android.AndroidMkData) {
fmt.Fprintln(w, "LOCAL_COMPATIBILITY_SUITE :=",
strings.Join(p.binaryDecorator.binaryProperties.Test_suites, " "))
}
+ // If the test config has an explicit config specified use it.
+ if p.testProperties.Test_config != nil {
+ fmt.Fprintln(w, "LOCAL_TEST_CONFIG :=",
+ *p.testProperties.Test_config)
+ }
})
base.subAndroidMk(ret, p.binaryDecorator.pythonInstaller)
}