summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Mathieu Chartier <mathieuc@google.com> 2019-10-30 15:55:44 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2019-10-30 15:55:44 +0000
commit67caaa6d8f6b338410aeef4f85290e6c559e37a8 (patch)
tree2ec3dbf48783a2480ce7f2c4ec8847a3b0f442f6
parent02b3ae47cf66e8333259d6620cfee4e516e55f99 (diff)
parent5bac951a30f388bde68563d6f5707bad5f4c631c (diff)
Merge "Fix test for renamed frameworks.jar"
-rw-r--r--tests/BootImageProfileTest/src/com/android/bootimageprofile/BootImageProfileTest.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/BootImageProfileTest/src/com/android/bootimageprofile/BootImageProfileTest.java b/tests/BootImageProfileTest/src/com/android/bootimageprofile/BootImageProfileTest.java
index 81937e6b7005..ead4a28beff4 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;