diff options
| author | 2018-07-24 22:44:12 +0000 | |
|---|---|---|
| committer | 2018-07-24 22:44:12 +0000 | |
| commit | cce87cbaa0ba5060deb4fa811afbe4b2465a3c01 (patch) | |
| tree | b1159a24c2b5e1c64aa9d24ce2e9a876c2d5f801 /java/java.go | |
| parent | 37ebbdee6c80e282d7927edb2684e13274e45441 (diff) | |
| parent | ec93cd9f2a60812bf1dbcf83ddffbe08c66edf95 (diff) | |
Merge changes from topic "metalava-sdk-jar"
* changes:
Add private-stub-annotations.jar as core-java lib
Use Metalava based android.jar for SDK
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/java/java.go b/java/java.go index 53f851bda..a2ba7e6f9 100644 --- a/java/java.go +++ b/java/java.go @@ -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 |