summaryrefslogtreecommitdiff
path: root/java/testing.go
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2019-02-20 20:18:37 -0800
committer android-build-merger <android-build-merger@google.com> 2019-02-20 20:18:37 -0800
commitfc2da332e9d895599e559c517cce2e838dd11587 (patch)
treef2adf33179e1dc56a7b5082329ba2508183594cf /java/testing.go
parent080f3699cf92f4321c0e7acfaa887c49da0bc576 (diff)
parent4ebb84d392613cea88ea3a71cce83188c40da34b (diff)
Merge "Make RuleBuilder methods take Paths" am: 4bb6764de9
am: 4ebb84d392 Change-Id: I2bc9e25f4749202a27ac4ca0bfb5131429466913
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 6febfa1d3..bec3c0b2c 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
}