From ec93cd9f2a60812bf1dbcf83ddffbe08c66edf95 Mon Sep 17 00:00:00 2001 From: Nan Zhang Date: Fri, 13 Jul 2018 16:36:04 -0700 Subject: [PATCH] Add private-stub-annotations.jar as core-java lib Since currently android.jar compile against to it. Test: m -j metalava_android_stubs_current Bug: b/78245848 Change-Id: Id5812f69125085821182295e577849b5f2c4bead --- java/java.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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