Make core-generated-annotation-stubs link as core stubs.

Bug: 123891440
Test: EXPERIMENTAL_USE_OPENJDK9=true make droid

(cherry picked from commit 4528becc46)

Merged-In: I117828f13a604030d1c36bdb60fffec4c4e08d6e
Change-Id: I17fa4e0c4106b63bf3cb0e3c3f78498a4072d9f5
This commit is contained in:
Pete Gillin 2019-05-08 15:10:06 +01:00
parent 42e862c56d
commit cbff326fe6

View file

@ -639,7 +639,7 @@ func getLinkType(m *Module, name string) (ret linkType, stubs bool) {
switch {
case name == "core.current.stubs" || name == "core.platform.api.stubs" ||
name == "stub-annotations" || name == "private-stub-annotations-jar" ||
name == "core-lambda-stubs":
name == "core-lambda-stubs" || name == "core-generated-annotation-stubs":
return javaCore, true
case ver == "core_current":
return javaCore, false