diff options
Diffstat (limited to 'java/aar.go')
| -rw-r--r-- | java/aar.go | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/java/aar.go b/java/aar.go index 713feee81..6b8912912 100644 --- a/java/aar.go +++ b/java/aar.go @@ -811,8 +811,11 @@ func (a *AndroidLibrary) GenerateAndroidBuildActions(ctx android.ModuleContext) a.linter.manifest = a.aapt.manifestPath a.linter.resources = a.aapt.resourceFiles - a.Module.extraProguardFlagFiles = append(a.Module.extraProguardFlagFiles, - a.proguardOptionsFile) + proguardSpecInfo := a.collectProguardSpecInfo(ctx) + ctx.SetProvider(ProguardSpecInfoProvider, proguardSpecInfo) + a.exportedProguardFlagFiles = proguardSpecInfo.ProguardFlagsFiles.ToList() + a.extraProguardFlagFiles = append(a.extraProguardFlagFiles, a.exportedProguardFlagFiles...) + a.extraProguardFlagFiles = append(a.extraProguardFlagFiles, a.proguardOptionsFile) var extraSrcJars android.Paths var extraCombinedJars android.Paths @@ -838,10 +841,6 @@ func (a *AndroidLibrary) GenerateAndroidBuildActions(ctx android.ModuleContext) ctx.CheckbuildFile(a.aarFile) } - proguardSpecInfo := a.collectProguardSpecInfo(ctx) - ctx.SetProvider(ProguardSpecInfoProvider, proguardSpecInfo) - a.exportedProguardFlagFiles = proguardSpecInfo.ProguardFlagsFiles.ToList() - prebuiltJniPackages := android.Paths{} ctx.VisitDirectDeps(func(module android.Module) { if info, ok := ctx.OtherModuleProvider(module, JniPackageProvider).(JniPackageInfo); ok { |