StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't write transitive dependencies to Android-${TARGET_PRODUCT}.mk" into main

Browse Source
This commit is contained in:
Colin Cross
2023-11-30 00:41:43 +00:00
committed by Gerrit Code Review
parent 8f7ee30d21 312634eb0f
commit 556ba81849
7 changed files with 91 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
java/dex.go
View File

@@ -91,12 +91,12 @@ type dexer struct {
dexProperties DexProperties
// list of extra proguard flag files
extraProguardFlagFiles android.Paths
proguardDictionary android.OptionalPath
proguardConfiguration android.OptionalPath
proguardUsageZip android.OptionalPath
resourcesInput android.OptionalPath
resourcesOutput android.OptionalPath
extraProguardFlagsFiles android.Paths
proguardDictionary android.OptionalPath
proguardConfiguration android.OptionalPath
proguardUsageZip android.OptionalPath
resourcesInput android.OptionalPath
resourcesOutput android.OptionalPath
providesTransitiveHeaderJars
}
@@ -296,7 +296,7 @@ func (d *dexer) r8Flags(ctx android.ModuleContext, flags javaBuilderFlags) (r8Fl
android.PathForSource(ctx, "build/make/core/proguard.flags"),
}
flagFiles = append(flagFiles, d.extraProguardFlagFiles...)
flagFiles = append(flagFiles, d.extraProguardFlagsFiles...)
// TODO(ccross): static android library proguard files
flagFiles = append(flagFiles, android.PathsForModuleSrc(ctx, opt.Proguard_flags_files)...)