From acdd6940719125104dfd2f692990c99682f95f05 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Fri, 15 Feb 2019 10:39:37 -0800 Subject: 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 --- java/testing.go | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'java/testing.go') 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 } -- cgit v1.2.3-59-g8ed1b