StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove sdk_version: "core_platform_current"

Browse Source 
This (effectively) reverts commit 3c979c3348.

core_platform_current is the new default when no_framework_libs: true
so doesn't need to be specified anywhere.

Bug: 113148576
Test: build
Change-Id: I6bb6c1a0ea24437c8253dc5d8fabd37edabc9d3e
This commit is contained in:
Neil Fuller
2018-10-18 19:48:58 +01:00
parent cbc64dcafe
commit 401eeba29f
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
java/java.go
View File

@@ -434,7 +434,7 @@ type sdkContext interface {
func sdkVersionOrDefault(ctx android.BaseContext, v string) string { func sdkVersionOrDefault(ctx android.BaseContext, v string) string {
switch v { switch v {
case "", "current", "system_current", "test_current", "core_current", "core_platform_current": case "", "current", "system_current", "test_current", "core_current":
return ctx.Config().DefaultAppTargetSdk() return ctx.Config().DefaultAppTargetSdk()
default: default:
return v return v
@@ -445,7 +445,7 @@ func sdkVersionOrDefault(ctx android.BaseContext, v string) string {
// it returns android.FutureApiLevel (10000). // it returns android.FutureApiLevel (10000).
func sdkVersionToNumber(ctx android.BaseContext, v string) (int, error) { func sdkVersionToNumber(ctx android.BaseContext, v string) (int, error) {
switch v { switch v {
case "", "current", "test_current", "system_current", "core_current", "core_platform_current": case "", "current", "test_current", "system_current", "core_current":
return ctx.Config().DefaultAppTargetSdkInt(), nil return ctx.Config().DefaultAppTargetSdkInt(), nil
default: default:
n := android.GetNumericSdkVersion(v) n := android.GetNumericSdkVersion(v)
@@ -566,8 +566,6 @@ func decodeSdkDep(ctx android.BaseContext, sdkContext sdkContext) sdkDep {
return toModule("android_test_stubs_current", "framework-res") return toModule("android_test_stubs_current", "framework-res")
case "core_current": case "core_current":
return toModule("core.current.stubs", "") return toModule("core.current.stubs", "")
case "core_platform_current":
return toModule("core.platform.api.stubs", "")
default: default:
return toPrebuilt(v) return toPrebuilt(v)
} }
@@ -734,7 +732,7 @@ func getLinkType(m *Module, name string) (ret linkType, stubs bool) {
name == "stub-annotations" || name == "private-stub-annotations-jar" || name == "stub-annotations" || name == "private-stub-annotations-jar" ||
name == "core-lambda-stubs": name == "core-lambda-stubs":
return javaCore, true return javaCore, true
case ver == "core_current" || ver == "core_platform_current": case ver == "core_current":
return javaCore, false return javaCore, false
case name == "android_system_stubs_current": case name == "android_system_stubs_current":
return javaSystem, true return javaSystem, true