diff options
| author | 2019-02-15 10:39:37 -0800 | |
|---|---|---|
| committer | 2019-02-20 14:23:37 -0800 | |
| commit | acdd6940719125104dfd2f692990c99682f95f05 (patch) | |
| tree | c68a0c59d926ac2dfd22122afb765d7eafa208f6 /java/testing.go | |
| parent | 45df0bd15a986aa4e202e3ed75548929fd9bdc23 (diff) | |
Make RuleBuilder methods take Paths
There are no more Make paths being used in Soong now that
dexpreopting and hiddenapi are in Soong. Use the Path types
in the inputs to RuleBuilder, and fix all users of RuleBuilder.
Test: all soong tests
Test: m checkbuild
Change-Id: I886f803d9a3419a43b2cae412537645f94c5dfbf
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 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 } |