diff options
| author | Nan Zhang <nanzhang@google.com> | 2018-08-07 13:41:10 -0700 |
|---|---|---|
| committer | Nan Zhang <nanzhang@google.com> | 2018-08-17 09:17:49 -0700 |
| commit | 863f05b797467bf209c305366fd8a2e84134ce24 (patch) | |
| tree | b327a3af5c4c2a799b33e32fb56cfb910561b6fb /java | |
| parent | 9b93a7dc7073f088534a618da8616ab5af4bf4d3 (diff) | |
| download | android_build_soong-863f05b797467bf209c305366fd8a2e84134ce24.tar.gz android_build_soong-863f05b797467bf209c305366fd8a2e84134ce24.tar.bz2 android_build_soong-863f05b797467bf209c305366fd8a2e84134ce24.zip | |
Removed Metalava related checks
Test: m -j checkbuild
Bug: b/70351683 b/78245848
Change-Id: Ie26e95081d8d90b626cfb43d017cb2ae500b7b25
Merged-In: Ie26e95081d8d90b626cfb43d017cb2ae500b7b25
Diffstat (limited to 'java')
| -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 70570464..e20b8b3c 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. // |