tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Build platform with core library stubs by default"

Browse source
This commit is contained in:
Neil Fuller 2018-10-17 14:59:48 +00:00 committed by Gerrit Code Review
commit ac857603ce
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
java/config/config.go
View file

@ -27,8 +27,8 @@ import (
var ( var (
pctx = android.NewPackageContext("android/soong/java/config") pctx = android.NewPackageContext("android/soong/java/config")
DefaultBootclasspathLibraries = []string{"core-oj", "core-libart", "core-simple", "bouncycastle", "conscrypt", "okhttp"} DefaultBootclasspathLibraries = []string{"core.platform.api.stubs", "core-lambda-stubs"}
DefaultSystemModules = "core-system-modules" DefaultSystemModules = "core-platform-api-stubs-system-modules"
DefaultLibraries = []string{"ext", "framework"} DefaultLibraries = []string{"ext", "framework"}
DefaultLambdaStubsLibrary = "core-lambda-stubs" DefaultLambdaStubsLibrary = "core-lambda-stubs"
SdkLambdaStubsPath = "prebuilts/sdk/tools/core-lambda-stubs.jar" SdkLambdaStubsPath = "prebuilts/sdk/tools/core-lambda-stubs.jar"

16
java/java_test.go
View file

@ -124,6 +124,7 @@ func testContext(config android.Config, bp string,
"android_system_stubs_current", "android_system_stubs_current",
"android_test_stubs_current", "android_test_stubs_current",
"core.current.stubs", "core.current.stubs",
"core.platform.api.stubs",
"kotlin-stdlib", "kotlin-stdlib",
} }
@ -134,7 +135,7 @@ func testContext(config android.Config, bp string,
srcs: ["a.java"], srcs: ["a.java"],
no_standard_libs: true, no_standard_libs: true,
sdk_version: "core_current", sdk_version: "core_current",
system_modules: "core-system-modules", system_modules: "core-platform-api-stubs-system-modules",
} }
`, extra) `, extra)
} }
@ -148,6 +149,7 @@ func testContext(config android.Config, bp string,
systemModules := []string{ systemModules := []string{
"core-system-modules", "core-system-modules",
"core-platform-api-stubs-system-modules",
"android_stubs_current_system_modules", "android_stubs_current_system_modules",
"android_system_stubs_current_system_modules", "android_system_stubs_current_system_modules",
"android_test_stubs_current_system_modules", "android_test_stubs_current_system_modules",
@ -367,15 +369,15 @@ var classpathTestcases = []struct {
}{ }{
{ {
name: "default", name: "default",
bootclasspath: []string{"core-oj", "core-libart", "core-simple", "bouncycastle", "conscrypt", "okhttp"}, bootclasspath: []string{"core.platform.api.stubs", "core-lambda-stubs"},
system: "core-system-modules", system: "core-platform-api-stubs-system-modules",
classpath: []string{"ext", "framework"}, classpath: []string{"ext", "framework"},
}, },
{ {
name: "blank sdk version", name: "blank sdk version",
properties: `sdk_version: "",`, properties: `sdk_version: "",`,
bootclasspath: []string{"core-oj", "core-libart", "core-simple", "bouncycastle", "conscrypt", "okhttp"}, bootclasspath: []string{"core.platform.api.stubs", "core-lambda-stubs"},
system: "core-system-modules", system: "core-platform-api-stubs-system-modules",
classpath: []string{"ext", "framework"}, classpath: []string{"ext", "framework"},
}, },
{ {
@ -433,8 +435,8 @@ var classpathTestcases = []struct {
{ {
name: "nostdlib system_modules", name: "nostdlib system_modules",
properties: `no_standard_libs: true, system_modules: "core-system-modules"`, properties: `no_standard_libs: true, system_modules: "core-platform-api-stubs-system-modules"`,
system: "core-system-modules", system: "core-platform-api-stubs-system-modules",
bootclasspath: []string{`""`}, bootclasspath: []string{`""`},
classpath: []string{}, classpath: []string{},
}, },