Merge "Split the core/platform API into stable and legacy versions." am: d7db79cc8b am: 5dbf9e09f2

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1322704

Change-Id: I731da4ed59432a67bdc3df124a8939bcf316aa0c
This commit is contained in:
Pete Gillin
2020-06-09 16:37:21 +00:00
committed by Automerger Merge Worker
6 changed files with 22 additions and 19 deletions

View File

@@ -841,8 +841,9 @@ type linkTypeContext interface {
func (m *Module) getLinkType(name string) (ret linkType, stubs bool) {
switch name {
case "core.current.stubs", "core.platform.api.stubs", "stub-annotations",
"private-stub-annotations-jar", "core-lambda-stubs", "core-generated-annotation-stubs":
case "core.current.stubs", "legacy.core.platform.api.stubs", "stable.core.platform.api.stubs",
"stub-annotations", "private-stub-annotations-jar",
"core-lambda-stubs", "core-generated-annotation-stubs":
return javaCore, true
case "android_stubs_current":
return javaSdk, true