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

Removed Metalava related checks

Browse Source 
Test: m -j checkbuild
Bug: b/70351683 b/78245848
Change-Id: Ie26e95081d8d90b626cfb43d017cb2ae500b7b25
Merged-In: Ie26e95081d8d90b626cfb43d017cb2ae500b7b25
This commit is contained in:
Nan Zhang
2018-08-07 13:41:10 -07:00
parent 9b93a7dc70
commit 863f05b797
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

@@ -584,10 +584,7 @@ func (j *Module) deps(ctx android.BottomUpMutatorContext) {
} }
if ctx.ModuleName() == "android_stubs_current" || if ctx.ModuleName() == "android_stubs_current" ||
ctx.ModuleName() == "android_system_stubs_current" || ctx.ModuleName() == "android_system_stubs_current" ||
ctx.ModuleName() == "android_test_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.AddDependency(ctx.Module(), frameworkApkTag, "framework-res") 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" || case name == "core.current.stubs" || ver == "core_current" || noStdLibs || name == "stub-annotations" ||
name == "private-stub-annotations-jar": name == "private-stub-annotations-jar":
return javaCore 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 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 return javaPlatform
case name == "android_stubs_current" || ver == "current" || name == "metalava_android_stubs_current": case name == "android_stubs_current" || ver == "current":
return javaSdk return javaSdk
case ver == "": case ver == "":
return javaPlatform return javaPlatform
@@ -819,10 +816,7 @@ func (j *Module) collectDeps(ctx android.ModuleContext) deps {
case frameworkApkTag: case frameworkApkTag:
if ctx.ModuleName() == "android_stubs_current" || if ctx.ModuleName() == "android_stubs_current" ||
ctx.ModuleName() == "android_system_stubs_current" || ctx.ModuleName() == "android_system_stubs_current" ||
ctx.ModuleName() == "android_test_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" {
// framework stubs.jar need to depend on framework-res.apk, in order to pull the // framework stubs.jar need to depend on framework-res.apk, in order to pull the
// resource files out of there for aapt. // resource files out of there for aapt.
// //