diff options
| author | 2024-10-24 19:16:05 +0000 | |
|---|---|---|
| committer | 2024-10-24 19:16:05 +0000 | |
| commit | 1c841c4ca01432a381dcda05820c015d208a9802 (patch) | |
| tree | 5b3bb328576b915880265a7dfe159629848fecc8 /java/platform_bootclasspath.go | |
| parent | 830f56a78e91ba02314edd6937fcf73f937635ba (diff) | |
| parent | a14fb6a73e2207c1084a0230fd97f08c14ef4818 (diff) | |
Merge changes from topic "move-depset" into main
* changes:
Update DepSet references
Move DepSet to blueprint
Convert DepSet to a wrapper around a pointer
Diffstat (limited to 'java/platform_bootclasspath.go')
| -rw-r--r-- | java/platform_bootclasspath.go | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/java/platform_bootclasspath.go b/java/platform_bootclasspath.go index 5bb77542c..acfc7745e 100644 --- a/java/platform_bootclasspath.go +++ b/java/platform_bootclasspath.go @@ -191,9 +191,7 @@ func (b *platformBootclasspathModule) GenerateAndroidBuildActions(ctx android.Mo var transitiveSrcFiles android.Paths for _, module := range append(allModules, implLibModule...) { if depInfo, ok := android.OtherModuleProvider(ctx, module, JavaInfoProvider); ok { - if depInfo.TransitiveSrcFiles != nil { - transitiveSrcFiles = append(transitiveSrcFiles, depInfo.TransitiveSrcFiles.ToList()...) - } + transitiveSrcFiles = append(transitiveSrcFiles, depInfo.TransitiveSrcFiles.ToList()...) } } jarArgs := resourcePathsToJarArgs(transitiveSrcFiles) |