diff --git a/java/java.go b/java/java.go index 3b789f689..ef8488cad 100644 --- a/java/java.go +++ b/java/java.go @@ -545,7 +545,7 @@ 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") { + if (ctx.ModuleName() == "framework-minus-apex") || (ctx.ModuleName() == "framework-annotation-proc") { ctx.AddVariationDependencies(nil, frameworkResTag, "framework-res") } if ctx.ModuleName() == "android_stubs_current" || @@ -829,7 +829,7 @@ func (j *Module) collectDeps(ctx android.ModuleContext) deps { ctx.PropertyErrorf("plugins", "%q is not a java_plugin module", otherName) } case frameworkResTag: - if (ctx.ModuleName() == "framework") || (ctx.ModuleName() == "framework-annotation-proc") { + 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)