diff options
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/java/java.go b/java/java.go index 705704646..e20b8b3c8 100644 --- a/java/java.go +++ b/java/java.go @@ -584,10 +584,7 @@ func (j *Module) deps(ctx android.BottomUpMutatorContext) { } if ctx.ModuleName() == "android_stubs_current" || ctx.ModuleName() == "android_system_stubs_current" || - ctx.ModuleName() == "android_test_stubs_current" || - ctx.ModuleName() == "metalava_android_stubs_current" || - ctx.ModuleName() == "metalava_android_system_stubs_current" || - ctx.ModuleName() == "metalava_android_test_stubs_current" { + ctx.ModuleName() == "android_test_stubs_current" { ctx.AddDependency(ctx.Module(), frameworkApkTag, "framework-res") } } @@ -718,11 +715,11 @@ func getLinkType(m *Module, name string) linkType { 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": + case name == "android_system_stubs_current" || strings.HasPrefix(ver, "system_"): return javaSystem - case name == "android_test_stubs_current" || strings.HasPrefix(ver, "test_") || name == "metalava_android_test_stubs_current": + case name == "android_test_stubs_current" || strings.HasPrefix(ver, "test_"): return javaPlatform - case name == "android_stubs_current" || ver == "current" || name == "metalava_android_stubs_current": + case name == "android_stubs_current" || ver == "current": return javaSdk case ver == "": return javaPlatform @@ -819,10 +816,7 @@ func (j *Module) collectDeps(ctx android.ModuleContext) deps { case frameworkApkTag: if ctx.ModuleName() == "android_stubs_current" || ctx.ModuleName() == "android_system_stubs_current" || - ctx.ModuleName() == "android_test_stubs_current" || - ctx.ModuleName() == "metalava_android_stubs_current" || - ctx.ModuleName() == "metalava_android_system_stubs_current" || - ctx.ModuleName() == "metalava_android_test_stubs_current" { + ctx.ModuleName() == "android_test_stubs_current" { // framework stubs.jar need to depend on framework-res.apk, in order to pull the // resource files out of there for aapt. // |