diff options
| author | Tobias Thierer <tobiast@google.com> | 2017-12-11 16:03:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-12-11 16:03:34 +0000 |
| commit | 67b5d7a89619f027c01bf33adee3eb26a20ef4ab (patch) | |
| tree | 8e3a8af05d74ed6a0eb5cbbc6f13a7f2d62b3ec1 | |
| parent | 08f3b459cfb4e8524bdcc244e894b8d7d13b62d8 (diff) | |
| parent | b78decf006ebb5a1eae61ab8ed0464855ed7b5e3 (diff) | |
| download | misc-67b5d7a89619f027c01bf33adee3eb26a20ef4ab.tar.gz | |
Merge "Pin robotest-internal to OpenJDK 8."
| -rw-r--r-- | common/robolectric/robotest-internal.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/common/robolectric/robotest-internal.mk b/common/robolectric/robotest-internal.mk index 6fa89aa2..9a716cb4 100644 --- a/common/robolectric/robotest-internal.mk +++ b/common/robolectric/robotest-internal.mk @@ -35,6 +35,7 @@ $(my_target_output): \ $(my_target_output): \ PRIVATE_TIMEOUT := $(my_timeout) # Runs the Robolectric tests and saves the output and return value. +# Robolectric < 3.5.1 only supports OpenJDK 8. http://b/70286093 $(my_target_output) $(my_target_retval): \ $(my_jars) $(hide) echo "host Robolectric: $(PRIVATE_MODULE) ($(dir $@))" @@ -48,6 +49,7 @@ $(my_target_output) $(my_target_retval): \ PRIVATE_TARGET_MESSAGE="$(PRIVATE_TARGET_MESSAGE)" \ PRIVATE_TIMEOUT="$(PRIVATE_TIMEOUT)" \ PRIVATE_TESTS="$(PRIVATE_TESTS)" \ + PATH=${ANDROID_JAVA8_HOME}/bin:${PATH} \ $(PRIVATE_ROBOLECTRIC_SCRIPT_PATH)/wrapper.sh \ "$(PRIVATE_MODULE)" \ "$(PRIVATE_TARGET_OUTPUT)" \ |