aboutsummaryrefslogtreecommitdiffstats
path: root/java/testing.go
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2019-02-21 05:03:00 +0000
committerColin Cross <ccross@android.com>2019-02-21 05:03:00 +0000
commitab898dc4a4645166c469e5409d2f42282a72d777 (patch)
tree0f0f62f25cb4a546543d4faddd084fb18df8d09b /java/testing.go
parentacdd6940719125104dfd2f692990c99682f95f05 (diff)
downloadandroid_build_soong-ab898dc4a4645166c469e5409d2f42282a72d777.tar.gz
android_build_soong-ab898dc4a4645166c469e5409d2f42282a72d777.tar.bz2
android_build_soong-ab898dc4a4645166c469e5409d2f42282a72d777.zip
Revert "Make RuleBuilder methods take Paths"
This reverts commit acdd6940719125104dfd2f692990c99682f95f05. Reason for revert: broke ndk build Change-Id: I5655e48c15eb8f5f0267afdd853fbc25765b8623
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 bec3c0b2..6febfa1d 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
}