Merge "Make core-generated-annotation-stubs link as core stubs." am: dd6dd18ef6

am: 075ed06c48

Change-Id: Ibfa8b26e17a5f2c3f267b7a0f8748e1496d5be79
This commit is contained in:
Pete Gillin 2019-05-13 05:07:53 -07:00 committed by android-build-merger
commit dc512d55ce

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