StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Removed Metalava related checks"

Browse Source
This commit is contained in:
Nan Zhang
2018-08-14 18:18:16 +00:00
committed by Android (Google) Code Review
parent 9dcc016ec8 2ef0a47155
commit 116901a7c2
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
java/java.go
View File

@@ -563,10 +563,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")
}
}
@@ -697,11 +694,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
@@ -797,10 +794,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.
//