Merge "Stop installing a profile into an APEX if profiles are disabled." (edd6fde5) · Commits · e / os / android_build_soong

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