tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge changes from topic "metalava-sdk-jar" am: cce87cbaa0

Browse source 
am: a9ebb36a15

Change-Id: I0952bbce2f37f4dd9f4e8a4b05d7de27d2891927
This commit is contained in:
Nan Zhang 2018-07-24 17:15:28 -07:00 committed by android-build-merger
commit e6e160cee5
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
java/java.go
View file

@ -693,7 +693,8 @@ func getLinkType(m *Module, name string) linkType {
ver := m.sdkVersion() ver := m.sdkVersion()
noStdLibs := Bool(m.properties.No_standard_libs) noStdLibs := Bool(m.properties.No_standard_libs)
switch { 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 return javaCore
case name == "android_system_stubs_current" || strings.HasPrefix(ver, "system_") || name == "metalava_android_system_stubs_current": case name == "android_system_stubs_current" || strings.HasPrefix(ver, "system_") || name == "metalava_android_system_stubs_current":
return javaSystem return javaSystem