diff options
| author | Colin Cross <ccross@android.com> | 2019-04-18 12:31:22 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2019-04-22 10:08:17 -0700 |
| commit | 31174703be8d659cd5ab78fb465ac16b4e493713 (patch) | |
| tree | 89787c3cb3becd0ad2437ae05bf53b63a595877e /java | |
| parent | ac9e61536f276a4629bbd237a4b7ff4b952c6f4d (diff) | |
| download | build_soong-31174703be8d659cd5ab78fb465ac16b4e493713.tar.gz build_soong-31174703be8d659cd5ab78fb465ac16b4e493713.tar.bz2 build_soong-31174703be8d659cd5ab78fb465ac16b4e493713.zip | |
Get default sdk_test.go values from config
This will help avoid merge conflicts between branches that have
additional default libraries.
Bug: 130798034
Test: sdk_test.go
Change-Id: I98d5b8b2ea939df7ef57686f3bd913d6a21edc5d
Merged-In: I98d5b8b2ea939df7ef57686f3bd913d6a21edc5d
(cherry picked from commit 901ea31b7ce8b9c3aac5461cc8a8b3480cffe011)
Diffstat (limited to 'java')
| -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 8ac10baa..a20e15f0 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", "updatable_media_stubs"}, + 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", "updatable_media_stubs"}, + bootclasspath: config.DefaultBootclasspathLibraries, + system: config.DefaultSystemModules, + classpath: config.DefaultLibraries, }, { |