summaryrefslogtreecommitdiff
path: root/java/testing.go
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2019-02-20 21:12:56 -0800
committer android-build-merger <android-build-merger@google.com> 2019-02-20 21:12:56 -0800
commitec60a92074d289ddbf4c65541c58e32926a42f7c (patch)
tree7d6d7d73ef2b2676489786810b11c97e8b383962 /java/testing.go
parentfc2da332e9d895599e559c517cce2e838dd11587 (diff)
parentdc68f8826c0e0c85fbcc8bbe45e4656905781886 (diff)
Merge "Revert "Make RuleBuilder methods take Paths"" am: 501d7e594a
am: dc68f8826c Change-Id: I6e74ddc0e0f776a10b24cda51532232857dc1407
Diffstat (limited to 'java/testing.go')
-rw-r--r--java/testing.go4
1 files changed, 0 insertions, 4 deletions
diff --git a/java/testing.go b/java/testing.go
index bec3c0b2c..6febfa1d3 100644
--- a/java/testing.go
+++ b/java/testing.go
@@ -18,7 +18,6 @@ import (
"fmt"
"android/soong/android"
- "android/soong/dexpreopt"
)
func TestConfig(buildDir string, env map[string]string) android.Config {
@@ -31,9 +30,6 @@ 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
}