diff options
| author | Sorin Basca <sorinbasca@google.com> | 2022-01-24 06:50:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-01-24 06:50:35 +0000 |
| commit | 47f340560aba41f3b487cedf38cfdd9c2f0a6703 (patch) | |
| tree | 86d52ea147b939768031468917d5ea74665fe09d /common | |
| parent | ef430da440cb5c768752e99e0d0870bfdf0859ac (diff) | |
| parent | 69360ea57e8fc2500ad4097a12c911d52d9d62ef (diff) | |
| download | misc-47f340560aba41f3b487cedf38cfdd9c2f0a6703.tar.gz | |
Merge "Using Java 11 to run tests with robolectric 4.5.1"
Diffstat (limited to 'common')
| -rw-r--r-- | common/robolectric/4.5.1/robotest-internal.mk | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/common/robolectric/4.5.1/robotest-internal.mk b/common/robolectric/4.5.1/robotest-internal.mk index f8e4470a..58a206af 100644 --- a/common/robolectric/4.5.1/robotest-internal.mk +++ b/common/robolectric/4.5.1/robotest-internal.mk @@ -29,8 +29,7 @@ $(my_target_output): PRIVATE_TARGET_OUTPUT := $(my_target_output) $(my_target_output): PRIVATE_TARGET_RETVAL := $(my_target_retval) $(my_target_output): PRIVATE_TARGET_NOCACHE := $(my_target_nocache) $(my_target_output): PRIVATE_TIMEOUT := $(my_timeout) -# Pin java binary to 8 or 9, the highest robolectric 3.6.1 and ASM 6.0 support: -$(my_target_output): PRIVATE_JAVA_PATH := $(if $(my_use_java8),$(ANDROID_JAVA8_HOME)/bin:,$(ANDROID_JAVA9_HOME)/bin:) +$(my_target_output): PRIVATE_JAVA_PATH := "$(ANDROID_JAVA_HOME)/bin:" $(my_target_output): PRIVATE_XML_OUTPUT_FILE := $(my_target_xml) $(my_target_output): .KATI_IMPLICIT_OUTPUTS := $(my_target_xml) $(my_target_retval) $(my_target_nocache) # Runs the Robolectric tests and saves the output and return value. @@ -94,4 +93,3 @@ my_target_retval := my_target_xml := my_target_nocache := my_filename_stem := -my_use_java8 := |