From 8e9ea8bb83bdab080c696d05eb1676b8dba0d35f Mon Sep 17 00:00:00 2001
From: Jiakai Zhang <jiakaiz@google.com>
Date: Thu, 23 Feb 2023 17:50:46 +0000
Subject: Add a new option `compilerFilter` to `bootImageConfig`.

After this change, the compiler filter can be specified by the option,
and profiles will not be used if the compiler filter is not
a profile-guided one.

This change also allows preloadedClassesFile to be empty.

Bug: 269230245
Test: m
Change-Id: I65e6b7209d2f0510bcc784a62623ab402b7f96bb
---
 java/bootclasspath_fragment.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'java/bootclasspath_fragment.go')

diff --git a/java/bootclasspath_fragment.go b/java/bootclasspath_fragment.go
index 101d3cad9..585f81887 100644
--- a/java/bootclasspath_fragment.go
+++ b/java/bootclasspath_fragment.go
@@ -1291,7 +1291,7 @@ func (module *PrebuiltBootclasspathFragmentModule) produceBootImageFiles(ctx and
 		}
 		return bootImageFiles
 	} else {
-		if profile == nil {
+		if profile == nil && imageConfig.isProfileGuided() {
 			ctx.ModuleErrorf("Unable to produce boot image files: neither boot image files nor profiles exists in the prebuilt apex")
 			return bootImageOutputs{}
 		}
-- 
cgit v1.2.3-59-g8ed1b