diff options
| author | 2023-10-31 17:27:02 +0000 | |
|---|---|---|
| committer | 2023-10-31 18:59:04 +0000 | |
| commit | c8e040c70fcaa9531c4123df6f12dd229c6d4ba0 (patch) | |
| tree | 37db4b1ef6675026ebd5de5670baa9ab7c709a17 /java/java.go | |
| parent | 82f0f7eca194357145d2dc8beb3efa6b7d9c7383 (diff) | |
transitive r8 flags for installable {android,java}_libraries
Only android_apps were actually applying transitive proguard flags files
to their r8 invocation. This CL ensures that this also occurs for
installable android_libraries and java_libraries.
Bug: 302342049
Test: go test ./java
Change-Id: Ie94d688d04367ee3d39e7e760fb3003df5829951
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) { |