commit edd6fde587f1cc5bb038c6b72d940b15a4a0686c
author Vladimir Marko <vmarko@google.com> Wed Dec 08 15:29:14 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 08 15:29:14 2021 +0000
tree 43de4eb869a68b3a35c6073b4169b66479122281
parent a85f7bde32a288368de0dba54f90b939214849e7
parent 29e35e115d70423635661f3b2387301f3ce1df62

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

java/bootclasspath_fragment.go

diff --git a/java/bootclasspath_fragment.go b/java/bootclasspath_fragment.go
index df1e121..bfe895c 100644
--- a/java/bootclasspath_fragment.go
+++ b/java/bootclasspath_fragment.go
@@ -594,8 +594,11 @@
 
 	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