Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9ebb36a authored by Nan Zhang's avatar Nan Zhang Committed by android-build-merger
Browse files

Merge changes from topic "metalava-sdk-jar" 

am: cce87cba

Change-Id: I5edc638cc8c859336c9de5e7e4b8dd9f0ff3004d
parents 6c14e737 cce87cba

java/java.go

+2 −1
Original line number Diff line number Diff line
@@ -693,7 +693,8 @@ func getLinkType(m *Module, name string) linkType { 
	ver := m.sdkVersion()

	noStdLibs := Bool(m.properties.No_standard_libs)

	switch {

	case name == "core.current.stubs" || ver == "core_current" || noStdLibs || name == "stub-annotations":

	case name == "core.current.stubs" || ver == "core_current" || noStdLibs || name == "stub-annotations" ||

		name == "private-stub-annotations-jar":

		return javaCore

	case name == "android_system_stubs_current" || strings.HasPrefix(ver, "system_") || name == "metalava_android_system_stubs_current":

		return javaSystem