commit | 8240bc9df9cab20ed1e90120cdc87ed81ac0328f | [log] [tgz] |
---|---|---|
author | Steven Moreland <smoreland@google.com> | Mon Jan 29 21:55:13 2024 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jan 29 21:55:13 2024 +0000 |
tree | e4242c607e36b441d3fd8b14d1e258ca0f46dd31 | |
parent | 244e5bb72ada2db2f5cd0d6e5a612db9ac83479e [diff] | |
parent | 255ba4368356fe4b4966824537a93b079609679f [diff] |
Merge "binder RPC tests timeouts to 10min" into android14-tests-dev am: 255ba43683 Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2886407 Change-Id: I38b4a231c31a3155c6f1582bc055ebf0800a3b20 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 873e955..f2c0465 100644 --- a/libs/binder/tests/Android.bp +++ b/libs/binder/tests/Android.bp
@@ -243,6 +243,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"],