From 8d8c660710037e87c7094a612246d64e5af74846 Mon Sep 17 00:00:00 2001
From: Qiao Yang <qiaoccolato@google.com>
Date: Fri, 5 May 2023 15:03:24 +0000
Subject: Revert "Generate boot image profiles even if dexpreopt is disabled."

Revert submission 2574032

Reason for revert: DroidMonitor-triggered revert due to breakage <https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=aosp_cf_riscv64_minidroid-userdebug&lkgb=10069333&lkbb=10075041&fkbb=10071083>, bug <b/280902279>

Reverted changes: /q/submissionid:2574032

Change-Id: I8e99f8231639198b149ea8d822ee7f9a5b391a89
BUG: <280902279>
---
 apex/bootclasspath_fragment_test.go | 20 --------------------
 1 file changed, 20 deletions(-)

(limited to 'apex/bootclasspath_fragment_test.go')

diff --git a/apex/bootclasspath_fragment_test.go b/apex/bootclasspath_fragment_test.go
index 4a661d4ea..2ddfd0305 100644
--- a/apex/bootclasspath_fragment_test.go
+++ b/apex/bootclasspath_fragment_test.go
@@ -497,26 +497,6 @@ func TestBootclasspathFragmentInArtApex(t *testing.T) {
 		})
 	})
 
-	t.Run("generate boot image profile even if dexpreopt is disabled", func(t *testing.T) {
-		result := android.GroupFixturePreparers(
-			commonPreparer,
-
-			// Configure some libraries in the art bootclasspath_fragment that match the source
-			// bootclasspath_fragment's contents property.
-			java.FixtureConfigureBootJars("com.android.art:foo", "com.android.art:bar"),
-			addSource("foo", "bar"),
-			java.FixtureSetBootImageInstallDirOnDevice("art", "system/framework"),
-			dexpreopt.FixtureDisableDexpreoptBootImages(true),
-		).RunTest(t)
-
-		ensureExactContents(t, result.TestContext, "com.android.art", "android_common_com.android.art_image", []string{
-			"etc/boot-image.prof",
-			"etc/classpaths/bootclasspath.pb",
-			"javalib/bar.jar",
-			"javalib/foo.jar",
-		})
-	})
-
 	t.Run("boot image disable generate profile", func(t *testing.T) {
 		result := android.GroupFixturePreparers(
 			commonPreparer,
-- 
cgit v1.2.3-59-g8ed1b