diff options
author | Colin Cross <ccross@android.com> | 2019-02-21 04:06:18 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-02-21 04:06:18 +0000 |
commit | 4bb6764de99488010b75dd546bada98435729f49 (patch) | |
tree | 9b1600a4074db578fe062834312d9ae9a212cdc9 /java/testing.go | |
parent | 1455d47788ae30ad3ae9517bb1df03c822fd7db5 (diff) | |
parent | acdd6940719125104dfd2f692990c99682f95f05 (diff) | |
download | android_build_soong-4bb6764de99488010b75dd546bada98435729f49.tar.gz android_build_soong-4bb6764de99488010b75dd546bada98435729f49.tar.bz2 android_build_soong-4bb6764de99488010b75dd546bada98435729f49.zip |
Merge "Make RuleBuilder methods take Paths"
Diffstat (limited to 'java/testing.go')
-rw-r--r-- | java/testing.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/java/testing.go b/java/testing.go index 6febfa1d..bec3c0b2 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 } |