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

Use built SDK stubs am: f19b9bb981 

am: cf3a11aa94

Change-Id: Ic6db9dd0a5d641cb9572aeda7526b9b31459c027
This commit is contained in:
Colin Cross 2018-04-10 12:23:06 -07:00 committed by android-build-merger
parent c1ba7a19ab cf3a11aa94
commit 17eddb6cc8
2 changed files with 49 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
java/java.go
View File

@ -19,6 +19,7 @@ package java
// is handled in builder.go
import (
"fmt"
"path/filepath"
"strconv"
"strings"
@ -420,13 +421,17 @@ func decodeSdkDep(ctx android.BaseContext, v string) sdkDep {
}
}
//toModule := func(m string) sdkDep {
// return sdkDep{
// useModule: true,
// module: m,
// systemModules: m + "_system_modules",
// }
//}
toModule := func(m string) sdkDep {
ret := sdkDep{
useModule: true,
module: m,
systemModules: m + "_system_modules",
}
if m == "core.current.stubs" {
ret.systemModules = "core-system-modules"
}
return ret
}
if ctx.Config().UnbundledBuild() && v != "" {
return toFile(v)
@ -437,14 +442,14 @@ func decodeSdkDep(ctx android.BaseContext, v string) sdkDep {
return sdkDep{
useDefaultLibs: true,
}
// TODO(ccross): re-enable these once we generate stubs, until then
// use the stubs in prebuilts/sdk/*current
//case "current":
// return toModule("android_stubs_current")
//case "system_current":
// return toModule("android_system_stubs_current")
//case "test_current":
// return toModule("android_test_stubs_current")
case "current":
return toModule("android_stubs_current")
case "system_current":
return toModule("android_system_stubs_current")
case "test_current":
return toModule("android_test_stubs_current")
case "core_current":
return toModule("core.current.stubs")
default:
return toFile(v)
}
@ -600,23 +605,34 @@ const (
javaPlatform
)
func getLinkType(m *Module) linkType {
func getLinkType(m *Module, name string) linkType {
ver := String(m.deviceProperties.Sdk_version)
if strings.HasPrefix(ver, "core_") {
switch {
case name == "core.current.stubs" || ver == "core_current":
return javaCore
} else if strings.HasPrefix(ver, "system_") {
case name == "android_system_stubs_current" || strings.HasPrefix(ver, "system_"):
return javaSystem
} else if _, err := strconv.Atoi(ver); err == nil || ver == "current" {
return javaSdk
} else {
// test_current falls back here as well
case name == "android_test_stubs_current" || strings.HasPrefix(ver, "test_"):
return javaPlatform
case name == "android_stubs_current" || ver == "current":
return javaSdk
case ver == "":
return javaPlatform
default:
if _, err := strconv.Atoi(ver); err != nil {
panic(fmt.Errorf("expected sdk_version to be a number, got %q", ver))
}
return javaSdk
}
}
func checkLinkType(ctx android.ModuleContext, from *Module, to *Library, tag dependencyTag) {
myLinkType := getLinkType(from)
otherLinkType := getLinkType(&to.Module)
if ctx.Host() {
return
}
myLinkType := getLinkType(from, ctx.ModuleName())
otherLinkType := getLinkType(&to.Module, ctx.OtherModuleName(to))
commonMessage := "Adjust sdk_version: property of the source or target module so that target module is built with the same or smaller API set than the source."
switch myLinkType {
@ -909,13 +925,9 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars ...android.Path
j.properties.Javac_shard_size)
}
}
// If sdk jar is java module, then directly return classesJar as header.jar
if j.Name() != "android_stubs_current" && j.Name() != "android_system_stubs_current" &&
j.Name() != "android_test_stubs_current" {
j.headerJarFile = j.compileJavaHeader(ctx, uniqueSrcFiles, srcJars, deps, flags, jarName)
if ctx.Failed() {
return
}
j.headerJarFile = j.compileJavaHeader(ctx, uniqueSrcFiles, srcJars, deps, flags, jarName)
if ctx.Failed() {
return
}
}
if len(uniqueSrcFiles) > 0 || len(srcJars) > 0 {

17
java/java_test.go
View File

@ -97,6 +97,7 @@ func testContext(config android.Config, bp string,
"android_stubs_current",
"android_system_stubs_current",
"android_test_stubs_current",
"core.current.stubs",
"kotlin-stdlib",
}
@ -106,6 +107,7 @@ func testContext(config android.Config, bp string,
name: "%s",
srcs: ["a.java"],
no_standard_libs: true,
sdk_version: "core_current",
system_modules: "core-system-modules",
}
`, extra)
@ -212,9 +214,6 @@ func moduleToPath(name string) string {
return name
case strings.HasSuffix(name, ".jar"):
return name
case name == "android_stubs_current" || name == "android_system_stubs_current" ||
name == "android_test_stubs_current":
return filepath.Join(buildDir, ".intermediates", name, "android_common", "javac", name+".jar")
default:
return filepath.Join(buildDir, ".intermediates", name, "android_common", "turbine-combined", name+".jar")
}
@ -346,17 +345,15 @@ var classpathTestcases = []struct {
name: "current",
properties: `sdk_version: "current",`,
bootclasspath: []string{`""`},
bootclasspath: []string{"android_stubs_current"},
system: "bootclasspath", // special value to tell 1.9 test to expect bootclasspath
classpath: []string{"prebuilts/sdk/current/android.jar"},
},
{
name: "system_current",
properties: `sdk_version: "system_current",`,
bootclasspath: []string{`""`},
bootclasspath: []string{"android_system_stubs_current"},
system: "bootclasspath", // special value to tell 1.9 test to expect bootclasspath
classpath: []string{"prebuilts/sdk/system_current/android.jar"},
},
{
@ -370,17 +367,15 @@ var classpathTestcases = []struct {
name: "test_current",
properties: `sdk_version: "test_current",`,
bootclasspath: []string{`""`},
bootclasspath: []string{"android_test_stubs_current"},
system: "bootclasspath", // special value to tell 1.9 test to expect bootclasspath
classpath: []string{"prebuilts/sdk/test_current/android.jar"},
},
{
name: "core_current",
properties: `sdk_version: "core_current",`,
bootclasspath: []string{`""`},
bootclasspath: []string{"core.current.stubs"},
system: "bootclasspath", // special value to tell 1.9 test to expect bootclasspath
classpath: []string{"prebuilts/sdk/current/core.jar"},
},
{