diff options
| author | Colin Cross <ccross@android.com> | 2019-02-15 10:39:37 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2019-02-20 22:06:09 -0800 |
| commit | 69f59a33271bc0646282f698754384f6bfe90624 (patch) | |
| tree | abee22cf22276b0a14eb5133239596d34d7e9f10 /java/testing.go | |
| parent | 501d7e594ab483932c7785ff9f7e3c46f985ee6f (diff) | |
| download | android_build_soong-69f59a33271bc0646282f698754384f6bfe90624.tar.gz android_build_soong-69f59a33271bc0646282f698754384f6bfe90624.tar.bz2 android_build_soong-69f59a33271bc0646282f698754384f6bfe90624.zip | |
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.
This reapplies I886f803d9a3419a43b2cae412537645f94c5dfbf with
fixes to disable preopt for Soong-only builds when the global
dexpreopt.config doesn't exist.
Test: all soong tests
Test: m checkbuild
Change-Id: I4dae9ecd5de22f062f9478ec8f0747f099cf8190
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 } |