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

Merge "Stop installing a profile into an APEX if profiles are disabled."

Browse Source
This commit is contained in:
Vladimir Marko
2021-12-08 15:29:14 +00:00
committed by Gerrit Code Review
parent a85f7bde32 29e35e115d
commit edd6fde587
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
java/bootclasspath_fragment.go
View File

@@ -594,8 +594,11 @@ func (b *BootclasspathFragmentModule) provideApexContentInfo(ctx android.ModuleC
if imageConfig != nil { if imageConfig != nil {
info.modules = imageConfig.modules info.modules = imageConfig.modules
info.profilePathOnHost = imageConfig.profilePathOnHost global := dexpreopt.GetGlobalConfig(ctx)
info.profileInstallPathInApex = imageConfig.profileInstallPathInApex if !global.DisableGenerateProfile {
info.profilePathOnHost = imageConfig.profilePathOnHost
info.profileInstallPathInApex = imageConfig.profileInstallPathInApex
}
} }
info.bootImageFilesByArch = bootImageFilesByArch info.bootImageFilesByArch = bootImageFilesByArch