From bcaa7dc7f757b1b5140766903cd197a86d6abc7a Mon Sep 17 00:00:00 2001 From: Jiakai Zhang Date: Tue, 2 Aug 2022 13:53:21 +0000 Subject: Update odsign_e2e_tests to support Go devices. The package name of ART on Go devices is com.google.android.go.art. Bug: 241036349 Change-Id: Ida69bda32136a55b3b84f119e9206dfd1add118d Test: atest odsign_e2e_tests (cherry picked from commit 9758576b49b7a9ee523f7127ed05d0450239f150) Merged-In: Ida69bda32136a55b3b84f119e9206dfd1add118d --- test/odsign/test-src/com/android/tests/odsign/OdsignTestUtils.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/odsign/test-src/com/android/tests/odsign/OdsignTestUtils.java b/test/odsign/test-src/com/android/tests/odsign/OdsignTestUtils.java index 7905660dc9..caf94a783b 100644 --- a/test/odsign/test-src/com/android/tests/odsign/OdsignTestUtils.java +++ b/test/odsign/test-src/com/android/tests/odsign/OdsignTestUtils.java @@ -86,7 +86,8 @@ public class OdsignTestUtils { String packagesOutput = mTestInfo.getDevice().executeShellCommand("pm list packages -f --apex-only"); Pattern p = Pattern.compile( - "^package:(.*)=(com(?:\\.google)?\\.android\\.art)$", Pattern.MULTILINE); + "^package:(.*)=(com(?:\\.google)?\\.android(?:\\.go)?\\.art)$", + Pattern.MULTILINE); Matcher m = p.matcher(packagesOutput); assertTrue("ART module not found. Packages are:\n" + packagesOutput, m.find()); String artApexPath = m.group(1); -- cgit v1.2.3-59-g8ed1b