openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Build platform with core library stubs by default 

Switch targets that don't explicitly specify an sdk_version
to using core.platform.api.stubs instead of the core library
implementations.

Note: the old core-oj target contained the source for
core-lambda-stubs too. The new core.platform.api.stubs
does not contain core-lambda-stubs so it is explicitly
added to the boot classpath list as part of the switch over.

Bug: 113148576
Test: build
Change-Id: I689d2127f6b69b4a7034fb96f3d9cf714f801794
This commit is contained in:
Neil Fuller 2018-10-09 16:19:19 +01:00
parent d054c225fb
commit bf210f7ea3
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 (
pctx = android.NewPackageContext("android/soong/java/config")
DefaultBootclasspathLibraries = []string{"core-oj", "core-libart", "core-simple", "bouncycastle", "conscrypt", "okhttp"}
DefaultSystemModules = "core-system-modules"
DefaultBootclasspathLibraries = []string{"core.platform.api.stubs", "core-lambda-stubs"}
DefaultSystemModules = "core-platform-api-stubs-system-modules"
DefaultLibraries = []string{"ext", "framework"}
DefaultLambdaStubsLibrary = "core-lambda-stubs"
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_test_stubs_current",
"core.current.stubs",
"core.platform.api.stubs",
"kotlin-stdlib",
}
@ -134,7 +135,7 @@ func testContext(config android.Config, bp string,
srcs: ["a.java"],
no_standard_libs: true,
sdk_version: "core_current",
system_modules: "core-system-modules",
system_modules: "core-platform-api-stubs-system-modules",
}
`, extra)
}
@ -148,6 +149,7 @@ func testContext(config android.Config, bp string,
systemModules := []string{
"core-system-modules",
"core-platform-api-stubs-system-modules",
"android_stubs_current_system_modules",
"android_system_stubs_current_system_modules",
"android_test_stubs_current_system_modules",
@ -367,15 +369,15 @@ var classpathTestcases = []struct {
}{
{
name: "default",
bootclasspath: []string{"core-oj", "core-libart", "core-simple", "bouncycastle", "conscrypt", "okhttp"},
system: "core-system-modules",
bootclasspath: []string{"core.platform.api.stubs", "core-lambda-stubs"},
system: "core-platform-api-stubs-system-modules",
classpath: []string{"ext", "framework"},
},
{
name: "blank sdk version",
properties: `sdk_version: "",`,
bootclasspath: []string{"core-oj", "core-libart", "core-simple", "bouncycastle", "conscrypt", "okhttp"},
system: "core-system-modules",
bootclasspath: []string{"core.platform.api.stubs", "core-lambda-stubs"},
system: "core-platform-api-stubs-system-modules",
classpath: []string{"ext", "framework"},
},
{
@ -433,8 +435,8 @@ var classpathTestcases = []struct {
{
name: "nostdlib system_modules",
properties: `no_standard_libs: true, system_modules: "core-system-modules"`,
system: "core-system-modules",
properties: `no_standard_libs: true, system_modules: "core-platform-api-stubs-system-modules"`,
system: "core-platform-api-stubs-system-modules",
bootclasspath: []string{`""`},
classpath: []string{},
},