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

Merge "transitive Java deps for r8"

Browse Source
This commit is contained in:
Sam Delmerico
2023-01-25 16:05:43 +00:00
committed by Gerrit Code Review
parent 7c30b6bad7 9f9c0a22fa
commit 41f9b734bb
7 changed files with 283 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
java/aar.go
View File

@@ -651,6 +651,8 @@ type AARImport struct {
// Functionality common to Module and Import.
embeddableInModuleAndImport
providesTransitiveHeaderJars
properties AARImportProperties
classpathFile android.WritablePath
@@ -897,8 +899,11 @@ func (a *AARImport) GenerateAndroidBuildActions(ctx android.ModuleContext) {
a.assetsPackage = mergedAssets
}
a.collectTransitiveHeaderJars(ctx)
ctx.SetProvider(JavaInfoProvider, JavaInfo{
HeaderJars: android.PathsIfNonNil(a.classpathFile),
TransitiveLibsHeaderJars: a.transitiveLibsHeaderJars,
TransitiveStaticLibsHeaderJars: a.transitiveStaticLibsHeaderJars,
ImplementationAndResourcesJars: android.PathsIfNonNil(a.classpathFile),
ImplementationJars: android.PathsIfNonNil(a.classpathFile),
})