diff options
| author | Colin Cross <ccross@android.com> | 2019-05-30 20:24:06 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-30 20:24:06 -0700 |
| commit | 7e5bf1cc8cb56be1977b523e79b03f06861817f6 (patch) | |
| tree | 0b373fbcaba1120f0f44aedefcf6a162c886e423 /java/robolectric.go | |
| parent | 63db3256d39d5a93ae7929e173098f7e79bba9d1 (diff) | |
| parent | acb00184c37d211ac25b4639597f6bae3c33ced3 (diff) | |
| download | build_soong-7e5bf1cc8cb56be1977b523e79b03f06861817f6.tar.gz build_soong-7e5bf1cc8cb56be1977b523e79b03f06861817f6.tar.bz2 build_soong-7e5bf1cc8cb56be1977b523e79b03f06861817f6.zip | |
Merge "Make test_options.timeout an int64" am: 76acdadaf7
am: acb00184c3
Change-Id: Id7a50b086ce755877e2656c98b5be8896b456bfd
Diffstat (limited to 'java/robolectric.go')
| -rw-r--r-- | java/robolectric.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/robolectric.go b/java/robolectric.go index 6d7052eb..19c4b94c 100644 --- a/java/robolectric.go +++ b/java/robolectric.go @@ -46,7 +46,7 @@ type robolectricProperties struct { Test_options struct { // Timeout in seconds when running the tests. - Timeout *string + Timeout *int64 } } |