Merge "Get default sdk_test.go values from config"
diff --git a/java/sdk_test.go b/java/sdk_test.go
index 7fa40a3..a20e15f 100644
--- a/java/sdk_test.go
+++ b/java/sdk_test.go
@@ -15,13 +15,15 @@
package java
import (
- "android/soong/android"
"path/filepath"
"reflect"
"strings"
"testing"
"github.com/google/blueprint/proptools"
+
+ "android/soong/android"
+ "android/soong/java/config"
)
var classpathTestcases = []struct {
@@ -37,16 +39,16 @@
}{
{
name: "default",
- bootclasspath: []string{"core.platform.api.stubs", "core-lambda-stubs"},
- system: "core-platform-api-stubs-system-modules",
- classpath: []string{"ext", "framework"},
+ bootclasspath: config.DefaultBootclasspathLibraries,
+ system: config.DefaultSystemModules,
+ classpath: config.DefaultLibraries,
},
{
name: "blank sdk version",
properties: `sdk_version: "",`,
- bootclasspath: []string{"core.platform.api.stubs", "core-lambda-stubs"},
- system: "core-platform-api-stubs-system-modules",
- classpath: []string{"ext", "framework"},
+ bootclasspath: config.DefaultBootclasspathLibraries,
+ system: config.DefaultSystemModules,
+ classpath: config.DefaultLibraries,
},
{
