commit 561077b45055950c9853efd57cfd524b7b56329f
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue May 17 21:07:39 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue May 17 21:07:39 2022 +0000
tree 747029d5204af1dd545dd5105c5253f29b918eb9
parent 6415652f99cc16127003b6992406bec21de8b1de
parent 60d13926fe2d680a974dce0fcadcd2103509d507

Snap for 8589293 from 60d13926fe2d680a974dce0fcadcd2103509d507 to sc-v2-platform-release

Change-Id: Ia774a10d15e8abe9dce3668debf93cc85f7fd2e9

apexer/Android.bp

diff --git a/apexer/Android.bp b/apexer/Android.bp
index 29be7d1..081bae1 100644
--- a/apexer/Android.bp
+++ b/apexer/Android.bp
@@ -151,6 +151,9 @@
     libs: [
         "apex_manifest",
     ],
+    test_options: {
+        unit_test: false,
+    },
 }
 
 apexer_deps_minus_go_tools = apexer_tools + [

apexer/TEST_MAPPING

diff --git a/apexer/TEST_MAPPING b/apexer/TEST_MAPPING
index 1ad3078..0b3e797 100644
--- a/apexer/TEST_MAPPING
+++ b/apexer/TEST_MAPPING
@@ -1,9 +1,11 @@
 {
-  "presubmit": [
-    {
-      "name": "apexer_test"
-    }
-  ],
+  // b/214537606: disabled since test lab JDK version has been upgraded to follow newer branches,
+  // and will not be able to match sc-v2-dev
+  //"presubmit": [
+  //  {
+  //    "name": "apexer_test"
+  //  }
+  //],
   "imports": [
     {
       "path": "system/apex/tests"

tests/src/com/android/tests/apex/SharedLibsApexTest.java

diff --git a/tests/src/com/android/tests/apex/SharedLibsApexTest.java b/tests/src/com/android/tests/apex/SharedLibsApexTest.java
index fdeac2c..df49f62 100644
--- a/tests/src/com/android/tests/apex/SharedLibsApexTest.java
+++ b/tests/src/com/android/tests/apex/SharedLibsApexTest.java
@@ -33,6 +33,7 @@
 import org.junit.rules.TemporaryFolder;
 import org.junit.runner.RunWith;
 
+import java.time.Duration;
 
 @RunWith(DeviceJUnit4ClassRunner.class)
 public class SharedLibsApexTest extends BaseHostJUnit4Test {
@@ -511,12 +512,13 @@
         assertThat(getDevice().doesFileExist("/data/apex/active/"
                 + getInstalledApexFileName(ApexName.SHAREDLIBS, ApexVersion.ONE))).isTrue();
         mPreparer.reboot();
-        assertThat(getDevice().doesFileExist("/data/apex/active/"
-                + getInstalledApexFileName(ApexName.BAR, ApexVersion.ONE))).isFalse();
-        assertThat(getDevice().doesFileExist("/data/apex/active/"
-                + getInstalledApexFileName(ApexName.FOO, ApexVersion.ONE))).isFalse();
-        assertThat(getDevice().doesFileExist("/data/apex/active/"
-                + getInstalledApexFileName(ApexName.SHAREDLIBS, ApexVersion.ONE))).isFalse();
+        mHostUtils.waitForFileDeleted("/data/apex/active/"
+                + getInstalledApexFileName(ApexName.BAR, ApexVersion.ONE), Duration.ofMinutes(3));
+        mHostUtils.waitForFileDeleted("/data/apex/active/"
+                + getInstalledApexFileName(ApexName.FOO, ApexVersion.ONE), Duration.ofMinutes(3));
+        mHostUtils.waitForFileDeleted("/data/apex/active/"
+                + getInstalledApexFileName(ApexName.SHAREDLIBS, ApexVersion.ONE),
+                Duration.ofMinutes(3));
 
         getDevice().disableAdbRoot();
         runAsResult = getDevice().executeShellCommand(