commit cbff326fe6735abc5874ef77790794e6d7ca1ea8
author Pete Gillin <peteg@google.com> Wed May 08 15:10:06 2019 +0100
committer Pete Gillin <peteg@google.com> Fri May 10 13:05:23 2019 +0100
tree c2be1d49c08b1e5797a4f62384abe33159205a6c
parent 42e862c56d9bb34b72fad9fef52de61ece04322f

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

diff --git a/java/java.go b/java/java.go
index e764ec3..01e7dc4 100644
--- a/java/java.go
+++ b/java/java.go
@@ -639,7 +639,7 @@
 	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