From 289206594c713cffc2774720ba562290e3da0aab Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Fri, 23 Aug 2019 16:08:57 +0900 Subject: [PATCH] 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 Merged-In: Ibb03db01c177d6e908cbbdf91f18be8744f02c03 (cherry picked from commit 8cc55bdffe1ebb4cfcfa412d3733fd918c58db60) Change-Id: Ibb03db01c177d6e908cbbdf91f18be8744f02c03 --- java/java.go | 9 --------- 1 file changed, 9 deletions(-) diff --git a/java/java.go b/java/java.go index 2193a2bd7..494a4e7c0 100644 --- a/java/java.go +++ b/java/java.go @@ -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") || (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") || (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" ||