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

am: dd6dd18ef6

Change-Id: I86172e280993167de25deceb22c3d4b08503e9f2
This commit is contained in:
Pete Gillin 2019-05-13 04:53:52 -07:00 committed by android-build-merger
commit 075ed06c48

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