Merge "Fix test for renamed frameworks.jar"

2019-10-30 15:55:44 +00:00
parent 02b3ae47cf 5bac951a30
commit 67caaa6d8f
1 changed files with 2 additions and 0 deletions
--- 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;