diff options
| author | 2023-11-01 15:29:11 +0000 | |
|---|---|---|
| committer | 2023-11-01 15:29:11 +0000 | |
| commit | d9569528bd7d45bce9555d96393cded55dfa3dc0 (patch) | |
| tree | a7036b5ca40f8dd0330c88354492d782a46c981e /java/java.go | |
| parent | 78a658b81f007d0c8774656504f55e589a9199d6 (diff) | |
| parent | c8e040c70fcaa9531c4123df6f12dd229c6d4ba0 (diff) | |
Merge "transitive r8 flags for installable {android,java}_libraries" into main
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/java/java.go b/java/java.go index bc240508b..55efb5f17 100644 --- a/java/java.go +++ b/java/java.go @@ -697,6 +697,11 @@ func (j *Library) GenerateAndroidBuildActions(ctx android.ModuleContext) { j.stem = proptools.StringDefault(j.overridableDeviceProperties.Stem, ctx.ModuleName()) + proguardSpecInfo := j.collectProguardSpecInfo(ctx) + ctx.SetProvider(ProguardSpecInfoProvider, proguardSpecInfo) + j.exportedProguardFlagFiles = proguardSpecInfo.ProguardFlagsFiles.ToList() + j.extraProguardFlagFiles = append(j.extraProguardFlagFiles, j.exportedProguardFlagFiles...) + apexInfo := ctx.Provider(android.ApexInfoProvider).(android.ApexInfo) if !apexInfo.IsForPlatform() { j.hideApexVariantFromMake = true @@ -741,10 +746,6 @@ func (j *Library) GenerateAndroidBuildActions(ctx android.ModuleContext) { } j.installFile = ctx.InstallFile(installDir, j.Stem()+".jar", j.outputFile, extraInstallDeps...) } - - proguardSpecInfo := j.collectProguardSpecInfo(ctx) - ctx.SetProvider(ProguardSpecInfoProvider, proguardSpecInfo) - j.exportedProguardFlagFiles = proguardSpecInfo.ProguardFlagsFiles.ToList() } func (j *Library) DepsMutator(ctx android.BottomUpMutatorContext) { |