Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29e35e11 authored by Jiakai Zhang's avatar Jiakai Zhang
Browse files

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

Bug: 209630530
Test: art/tools/golem/build-target.sh
Change-Id: I0ac4e1860a47da20626b423b9b1f62dd49259deb
parent 939cb7b0

java/bootclasspath_fragment.go

+5 −2
Original line number Diff line number Diff line
@@ -594,9 +594,12 @@ func (b *BootclasspathFragmentModule) provideApexContentInfo(ctx android.ModuleC 


	if imageConfig != nil {

		info.modules = imageConfig.modules

		global := dexpreopt.GetGlobalConfig(ctx)

		if !global.DisableGenerateProfile {

			info.profilePathOnHost = imageConfig.profilePathOnHost

			info.profileInstallPathInApex = imageConfig.profileInstallPathInApex

		}

	}



	info.bootImageFilesByArch = bootImageFilesByArch