summaryrefslogtreecommitdiff
path: root/java/java.go
diff options
context:
space:
mode:
author Pete Gillin <peteg@google.com> 2019-05-13 04:53:52 -0700
committer android-build-merger <android-build-merger@google.com> 2019-05-13 04:53:52 -0700
commit075ed06c489ce2322627994093f143aabb4405dc (patch)
treed01a8c3d322b0740cdc8e26a7b39b88310dd50a7 /java/java.go
parent927aad4f0a31d754f99158ad9e7e0d05e696b85f (diff)
parentdd6dd18ef62e74dd0a7c9b4644f771765118d0d9 (diff)
Merge "Make core-generated-annotation-stubs link as core stubs."
am: dd6dd18ef6 Change-Id: I86172e280993167de25deceb22c3d4b08503e9f2
Diffstat (limited to 'java/java.go')
-rw-r--r--java/java.go2
1 files changed, 1 insertions, 1 deletions
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