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." am: edd6fde587

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1913479

Change-Id: Ic8051e916e4b6679c626ff4086b8d90b611fd012
This commit is contained in:
Vladimir Marko
2021-12-08 15:48:19 +00:00
committed by Automerger Merge Worker
parent 6c8f0b3890 edd6fde587
commit 7e556310b9
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
java/bootclasspath_fragment.go
View File

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