diff options
| author | Pete Gillin <peteg@google.com> | 2020-06-09 16:37:21 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-09 16:37:21 +0000 |
| commit | 811814282d5264ffd8c941071007cf7ec2e7d457 (patch) | |
| tree | 2892d7fec7018eb796cd99e629fb40cb3f8f61d8 /java/java.go | |
| parent | 578c91fe13c0882693d949f66c6f8f072d29f9cd (diff) | |
| parent | 5dbf9e09f269e308de15b527454a500f9d90a75f (diff) | |
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
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/java/java.go b/java/java.go index e1190d3e3..9a14ee81a 100644 --- a/java/java.go +++ b/java/java.go @@ -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 |