commit bcaa7dc7f757b1b5140766903cd197a86d6abc7a
author Jiakai Zhang <jiakaiz@google.com> Tue Aug 02 13:53:21 2022 +0000
committer Cherrypicker Worker <android-build-cherrypicker-worker@google.com> Thu Aug 04 10:51:16 2022 +0000
tree 8b536be4f61b7ff51e814b14b451ba8a87fec8ea
parent c618f7c01e83409e57f3e74bdc1fd4bdc6a828b5

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

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 7905660..caf94a7 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 @@
         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);