summaryrefslogtreecommitdiff
path: root/java/testing.go
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2019-02-20 20:22:51 -0800
committer android-build-merger <android-build-merger@google.com> 2019-02-20 20:22:51 -0800
commit43e1ff53379a76a876386e69e12bbb24f227424d (patch)
treeec70fb13d47db48942c206de6e45b3662a72a2c7 /java/testing.go
parente5fd339bb8448d2900c80ccedcbaaf33b7b1c1b8 (diff)
parentfc2da332e9d895599e559c517cce2e838dd11587 (diff)
Merge "Make RuleBuilder methods take Paths" am: 4bb6764de9 am: 4ebb84d392
am: fc2da332e9 Change-Id: Ic6563627f7853d9850e996d4579ac671d47d2c7b
Diffstat (limited to 'java/testing.go')
-rw-r--r--java/testing.go4
1 files changed, 4 insertions, 0 deletions
diff --git a/java/testing.go b/java/testing.go
index 713eca1a3..a55a1eef4 100644
--- a/java/testing.go
+++ b/java/testing.go
@@ -18,6 +18,7 @@ import (
"fmt"
"android/soong/android"
+ "android/soong/dexpreopt"
)
func TestConfig(buildDir string, env map[string]string) android.Config {
@@ -30,6 +31,9 @@ func TestConfig(buildDir string, env map[string]string) android.Config {
config := android.TestArchConfig(buildDir, env)
config.TestProductVariables.DeviceSystemSdkVersions = []string{"14", "15"}
+ pathCtx := android.PathContextForTesting(config, nil)
+ setDexpreoptGlobalConfig(config, dexpreopt.GlobalConfigForTests(pathCtx))
+
return config
}