Merge "Make RuleBuilder methods take Paths" am: 4bb6764de9 am: 4ebb84d392

am: fc2da332e9

Change-Id: Ic6563627f7853d9850e996d4579ac671d47d2c7b

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
 }