diff options
| author | 2021-12-08 15:29:14 +0000 | |
|---|---|---|
| committer | 2021-12-08 15:29:14 +0000 | |
| commit | edd6fde587f1cc5bb038c6b72d940b15a4a0686c (patch) | |
| tree | 43de4eb869a68b3a35c6073b4169b66479122281 /java/bootclasspath_fragment.go | |
| parent | a85f7bde32a288368de0dba54f90b939214849e7 (diff) | |
| parent | 29e35e115d70423635661f3b2387301f3ce1df62 (diff) | |
Merge "Stop installing a profile into an APEX if profiles are disabled."
Diffstat (limited to 'java/bootclasspath_fragment.go')
| -rw-r--r-- | java/bootclasspath_fragment.go | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/java/bootclasspath_fragment.go b/java/bootclasspath_fragment.go index df1e121be..bfe895c17 100644 --- a/java/bootclasspath_fragment.go +++ b/java/bootclasspath_fragment.go @@ -594,8 +594,11 @@ func (b *BootclasspathFragmentModule) provideApexContentInfo(ctx android.ModuleC if imageConfig != nil { info.modules = imageConfig.modules - info.profilePathOnHost = imageConfig.profilePathOnHost - info.profileInstallPathInApex = imageConfig.profileInstallPathInApex + global := dexpreopt.GetGlobalConfig(ctx) + if !global.DisableGenerateProfile { + info.profilePathOnHost = imageConfig.profilePathOnHost + info.profileInstallPathInApex = imageConfig.profileInstallPathInApex + } } info.bootImageFilesByArch = bootImageFilesByArch |