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 901ea31b7c
)
This commit is contained in:
parent
ac9e61536f
commit
31174703be
|
@ -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,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue