diff options
| author | 2023-12-20 00:02:20 +0000 | |
|---|---|---|
| committer | 2023-12-20 00:02:20 +0000 | |
| commit | 96feedc5558962f47b16b9ca4d62a7948e2c8a1f (patch) | |
| tree | 18967296dbec01a63f79d0048964808352197de8 /java/bootclasspath_fragment.go | |
| parent | 225ad7e8b2cf7584e9d93a5356222a04acaff8dc (diff) | |
| parent | da739a30a6575ae0345e6694da6ff65b1eceabba (diff) | |
Merge "Use the correct prof file when multiple prebuilt apexes exist" into main
Diffstat (limited to 'java/bootclasspath_fragment.go')
| -rw-r--r-- | java/bootclasspath_fragment.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/java/bootclasspath_fragment.go b/java/bootclasspath_fragment.go index 83030b51e..010dbec8f 100644 --- a/java/bootclasspath_fragment.go +++ b/java/bootclasspath_fragment.go @@ -534,7 +534,7 @@ func (b *BootclasspathFragmentModule) provideApexContentInfo(ctx android.ModuleC if profile != nil { info.profilePathOnHost = profile - info.profileInstallPathInApex = profileInstallPathInApex + info.profileInstallPathInApex = ProfileInstallPathInApex } // Make the apex content info available for other modules. @@ -1074,7 +1074,7 @@ func (module *PrebuiltBootclasspathFragmentModule) produceBootImageProfile(ctx a return nil // An error has been reported by FindDeapexerProviderForModule. } - return di.PrebuiltExportPath(profileInstallPathInApex) + return di.PrebuiltExportPath(ProfileInstallPathInApex) } func (b *PrebuiltBootclasspathFragmentModule) getProfilePath() android.Path { @@ -1094,7 +1094,7 @@ var _ commonBootclasspathFragment = (*PrebuiltBootclasspathFragmentModule)(nil) func (module *PrebuiltBootclasspathFragmentModule) RequiredFilesFromPrebuiltApex(ctx android.BaseModuleContext) []string { for _, apex := range module.ApexProperties.Apex_available { if isProfileProviderApex(ctx, apex) { - return []string{profileInstallPathInApex} + return []string{ProfileInstallPathInApex} } } return nil |