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

Commit 8cc55bdf authored by Jiyong Park's avatar Jiyong Park
Browse files

Remove the automatic dependency to framework-res.apk for R/Manifest 

framework-minus-apex and framework-annotation-proc had automatic
dependency to framework-res.apk to get the generated R.java and
Manifest.java as their inputs.

That is no longer needed as the sources are fed from framework-srcs
filegroup.

Bug: 70046217
Test: m

Change-Id: Ibb03db01c177d6e908cbbdf91f18be8744f02c03
parent 94f37f33

java/java.go

+0 −9
Original line number Diff line number Diff line
@@ -550,9 +550,6 @@ func (j *Module) deps(ctx android.BottomUpMutatorContext) { 
		} else if *j.deviceProperties.System_modules != "none" {

			ctx.AddVariationDependencies(nil, systemModulesTag, *j.deviceProperties.System_modules)

		}

		if (ctx.ModuleName() == "framework-minus-apex") || (ctx.ModuleName() == "framework-annotation-proc") {

			ctx.AddVariationDependencies(nil, frameworkResTag, "framework-res")

		}

		if ctx.ModuleName() == "android_stubs_current" ||

			ctx.ModuleName() == "android_system_stubs_current" ||

			ctx.ModuleName() == "android_test_stubs_current" {
@@ -833,12 +830,6 @@ func (j *Module) collectDeps(ctx android.ModuleContext) deps { 
				} else {

					ctx.PropertyErrorf("plugins", "%q is not a java_plugin module", otherName)

				}

			case frameworkResTag:

				if (ctx.ModuleName() == "framework-minus-apex") || (ctx.ModuleName() == "framework-annotation-proc") {

					// framework.jar has a one-off dependency on the R.java and Manifest.java files

					// generated by framework-res.apk

					deps.srcJars = append(deps.srcJars, dep.(*AndroidApp).aaptSrcJar)

				}

			case frameworkApkTag:

				if ctx.ModuleName() == "android_stubs_current" ||

					ctx.ModuleName() == "android_system_stubs_current" ||