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

Commit 81768cc9 authored by Liz Kammer's avatar Liz Kammer Committed by Automerger Merge Worker
Browse files

Merge "Remove special-cased stub deps on framework-res" into rvc-dev am: 0f35aeec 

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/12849659

Change-Id: I4c7b013d883f0d93caa32a0cb07aa374ccb05f31
parents 4139580e 0f35aeec

java/java.go

+0 −19
Original line number Diff line number Diff line
@@ -578,7 +578,6 @@ var ( 
	bootClasspathTag      = dependencyTag{name: "bootclasspath"}

	systemModulesTag      = dependencyTag{name: "system modules"}

	frameworkResTag       = dependencyTag{name: "framework-res"}

	frameworkApkTag       = dependencyTag{name: "framework-apk"}

	kotlinStdlibTag       = dependencyTag{name: "kotlin-stdlib"}

	kotlinAnnotationsTag  = dependencyTag{name: "kotlin-annotations"}

	proguardRaiseTag      = dependencyTag{name: "proguard-raise"}
@@ -703,12 +702,6 @@ func (j *Module) deps(ctx android.BottomUpMutatorContext) { 
		if sdkDep.systemModules != "" {

			ctx.AddVariationDependencies(nil, systemModulesTag, sdkDep.systemModules)

		}



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

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

			ctx.ModuleName() == "android_test_stubs_current" {

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

		}

	}



	syspropPublicStubs := syspropPublicStubs(ctx.Config())
@@ -1057,18 +1050,6 @@ func (j *Module) collectDeps(ctx android.ModuleContext) deps { 
				} else {

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

				}

			case frameworkApkTag:

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

					ctx.ModuleName() == "android_system_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.

					//

					// Normally the package rule runs aapt, which includes the resource,

					// but we're not running that in our package rule so just copy in the

					// resource files here.

					deps.staticResourceJars = append(deps.staticResourceJars, dep.(*AndroidApp).exportPackage)

				}

			case kotlinStdlibTag:

				deps.kotlinStdlib = append(deps.kotlinStdlib, dep.HeaderJars()...)

			case kotlinAnnotationsTag: