| commit | a67c77c3819516c257bfb61dd599a655d1e80959 | [log] [tgz] |
|---|---|---|
| author | Steven Moreland <smoreland@google.com> | Tue Dec 19 03:52:22 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Dec 19 03:52:22 2023 +0000 |
| tree | 97be884a9cb861a2d34f60fedf92ab9ae62220ed | |
| parent | 911e500a8b00b7c786b0e5f91bd026c800d918c7 [diff] | |
| parent | 097284e926ea4ef50faf0f336242ec5e148fbf38 [diff] |
Merge "binder RPC tests timeouts to 10min" into main am: 6acf70806c am: 097284e926 Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2877183 Change-Id: I186d9df1de7bdb9e9e59f43577f2f93a361b20a2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/libs/binder/tests/Android.bp b/libs/binder/tests/Android.bp index e4d4de8..041c280 100644 --- a/libs/binder/tests/Android.bp +++ b/libs/binder/tests/Android.bp
@@ -256,6 +256,12 @@ // contention on the device. b/276820894 test_options: { unit_test: false, + test_runner_options: [ + { + name: "native-test-timeout", + value: "10m", + }, + ], }, test_suites: ["general-tests"],