From 5bac951a30f388bde68563d6f5707bad5f4c631c Mon Sep 17 00:00:00 2001
From: Mathieu Chartier <mathieuc@google.com>
Date: Tue, 29 Oct 2019 17:42:04 -0700
Subject: [PATCH] Fix test for renamed frameworks.jar

The frameworks jar was renamed to framework-minus-apex.jar.

Test: atest BootImageProfileTest
Bug: 139883463
Change-Id: I12d321f8458c584e3d262128d534e6f3c18b12a0
---
 .../src/com/android/bootimageprofile/BootImageProfileTest.java  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/BootImageProfileTest/src/com/android/bootimageprofile/BootImageProfileTest.java b/tests/BootImageProfileTest/src/com/android/bootimageprofile/BootImageProfileTest.java
index 81937e6b70057..ead4a28beff49 100644
--- a/tests/BootImageProfileTest/src/com/android/bootimageprofile/BootImageProfileTest.java
+++ b/tests/BootImageProfileTest/src/com/android/bootimageprofile/BootImageProfileTest.java
@@ -94,6 +94,8 @@ public class BootImageProfileTest implements IDeviceTest {
         boolean sawServices = false;
         for (String line : res.split("\n")) {
             if (line.contains("framework.jar")) {
+                sawFramework = true;  // Legacy
+            } else if (line.contains("framework-minus-apex.jar")) {
                 sawFramework = true;
             } else if (line.contains("services.jar")) {
                 sawServices = true;