diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/base.go | 2 | ||||
| -rw-r--r-- | java/dexpreopt.go | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/java/base.go b/java/base.go index b4f800bbd..1a6584bfb 100644 --- a/java/base.go +++ b/java/base.go @@ -1852,7 +1852,7 @@ func (j *Module) compileJavaClasses(ctx android.ModuleContext, jarName string, i classes := android.PathForModuleOut(ctx, "javac", jarName).OutputPath TransformJavaToClasses(ctx, classes, idx, srcFiles, srcJars, annoSrcJar, flags, extraJarDeps) - if ctx.Config().EmitXrefRules() { + if ctx.Config().EmitXrefRules() && ctx.Module() == ctx.PrimaryModule() { extractionFile := android.PathForModuleOut(ctx, kzipName) emitXrefRule(ctx, extractionFile, idx, srcFiles, srcJars, flags, extraJarDeps) j.kytheFiles = append(j.kytheFiles, extractionFile) diff --git a/java/dexpreopt.go b/java/dexpreopt.go index 832b85036..4fe3664fe 100644 --- a/java/dexpreopt.go +++ b/java/dexpreopt.go @@ -312,10 +312,6 @@ func dexpreoptToolDepsMutator(ctx android.BottomUpMutatorContext) { dexpreopt.RegisterToolDeps(ctx) } -func (d *dexpreopter) odexOnSystemOther(ctx android.ModuleContext, libName string, installPath android.InstallPath) bool { - return dexpreopt.OdexOnSystemOtherByName(libName, android.InstallPathToOnDevicePath(ctx, installPath), dexpreopt.GetGlobalConfig(ctx)) -} - // Returns the install path of the dex jar of a module. // // Do not rely on `ApexInfo.ApexVariationName` because it can be something like "apex1000", rather |