Merge "Get default sdk_test.go values from config" into qt-dev-plus-aosp

This commit is contained in:
TreeHugger Robot
2019-04-18 22:35:30 +00:00
committed by Android (Google) Code Review

View File

@@ -15,13 +15,15 @@
package java package java
import ( import (
"android/soong/android"
"path/filepath" "path/filepath"
"reflect" "reflect"
"strings" "strings"
"testing" "testing"
"github.com/google/blueprint/proptools" "github.com/google/blueprint/proptools"
"android/soong/android"
"android/soong/java/config"
) )
var classpathTestcases = []struct { var classpathTestcases = []struct {
@@ -37,16 +39,16 @@ var classpathTestcases = []struct {
}{ }{
{ {
name: "default", name: "default",
bootclasspath: []string{"core.platform.api.stubs", "core-lambda-stubs"}, bootclasspath: config.DefaultBootclasspathLibraries,
system: "core-platform-api-stubs-system-modules", system: config.DefaultSystemModules,
classpath: []string{"ext", "framework", "updatable_media_stubs"}, classpath: config.DefaultLibraries,
}, },
{ {
name: "blank sdk version", name: "blank sdk version",
properties: `sdk_version: "",`, properties: `sdk_version: "",`,
bootclasspath: []string{"core.platform.api.stubs", "core-lambda-stubs"}, bootclasspath: config.DefaultBootclasspathLibraries,
system: "core-platform-api-stubs-system-modules", system: config.DefaultSystemModules,
classpath: []string{"ext", "framework", "updatable_media_stubs"}, classpath: config.DefaultLibraries,
}, },
{ {