diff options
author | Colin Cross <ccross@android.com> | 2019-04-18 12:31:22 -0700 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2019-04-18 12:35:16 -0700 |
commit | 60405e50f8bac88f483d78b07a0fa2311ee08b9f (patch) | |
tree | 49fbb3e4f3210d79f571dad3faeb66b3b466efb0 /java/sdk_test.go | |
parent | 79c7c26d8a1987b4c60256d05e2cc52588ccddc0 (diff) |
Get default sdk_test.go values from config
This will help avoid merge conflicts between branches that have
additional default libraries.
Test: sdk_test.go
Change-Id: I98d5b8b2ea939df7ef57686f3bd913d6a21edc5d
Merged-In: I98d5b8b2ea939df7ef57686f3bd913d6a21edc5d
Diffstat (limited to 'java/sdk_test.go')
-rw-r--r-- | java/sdk_test.go | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/java/sdk_test.go b/java/sdk_test.go index 7fa40a34b..a20e15f03 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 @@ var classpathTestcases = []struct { }{ { 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, }, { |