From cbff326fe6735abc5874ef77790794e6d7ca1ea8 Mon Sep 17 00:00:00 2001 From: Pete Gillin Date: Wed, 8 May 2019 15:10:06 +0100 Subject: [PATCH] Make core-generated-annotation-stubs link as core stubs. Bug: 123891440 Test: EXPERIMENTAL_USE_OPENJDK9=true make droid (cherry picked from commit 4528becc46d69963a838c5af05e6ad9075b63bbe) Merged-In: I117828f13a604030d1c36bdb60fffec4c4e08d6e Change-Id: I17fa4e0c4106b63bf3cb0e3c3f78498a4072d9f5 --- java/java.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/java.go b/java/java.go index e764ec303..01e7dc407 100644 --- a/java/java.go +++ b/java/java.go @@ -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