Merge "Remove special-cased stub deps on framework-res" into rvc-dev (0f35aeec) · Commits · e / os / android_build_soong

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: