commit 9bd2249e1585813475f2da07d9491e12d48ab8b9
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Nov 07 23:58:38 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Nov 07 23:58:38 2024 +0000
tree 7e9d2dbbe8234e1040591bee2b64d51b2dbd46a3
parent 6d1271340a21c42e3035fa4280090970a7c51c58
parent 1d4ac1eed611cd4686029a8d8e8a85c5856514e8

Merge "Increase the test timeout" into main am: 308bcbea8e am: 1d4ac1eed6

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3342095

Change-Id: Id03cbd8cc126e57f9ab9fe78ef825ec235c9c820
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

fs_mgr/libsnapshot/snapuserd/Android.bp

diff --git a/fs_mgr/libsnapshot/snapuserd/Android.bp b/fs_mgr/libsnapshot/snapuserd/Android.bp
index 4167159..97cfe76 100644
--- a/fs_mgr/libsnapshot/snapuserd/Android.bp
+++ b/fs_mgr/libsnapshot/snapuserd/Android.bp
@@ -265,6 +265,10 @@
                 name: "force-no-test-error",
                 value: "false",
             },
+            {
+                name: "native-test-timeout",
+                value: "15m",
+            },
         ],
     },
 }