Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ef0a471 authored by Nan Zhang's avatar Nan Zhang
Browse files

Removed Metalava related checks 

Test: m -j checkbuild
Bug: b/70351683 b/78245848
Change-Id: Ie26e95081d8d90b626cfb43d017cb2ae500b7b25
parent bea1e551

java/java.go

+5 −11
Original line number Diff line number Diff line
@@ -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.

					//