diff options
| author | Victor Chang <vichang@google.com> | 2020-07-03 16:35:02 +0100 |
|---|---|---|
| committer | Victor Chang <vichang@google.com> | 2020-07-10 00:10:27 +0100 |
| commit | b84738fc776d8934770b7d5e54aaa66171af269f (patch) | |
| tree | d3c4a34f563ade045954382ec62e318189ff112f | |
| parent | 16e861acf2c34839a95958b1b216e0a2f7023a01 (diff) | |
| download | robolectric-shadows-b84738fc776d8934770b7d5e54aaa66171af269f.tar.gz | |
Add R/S support to Robolectric
Bug: 141747409
Test: "m Run_robolectric_robolectric_tests" build successfully
Test: m RunSettingsRoboTests
Change-Id: Ib0adcb184ef99c50efcc0c32b48ec0f7cfdf5dd3
| -rw-r--r-- | processor/sdks.txt | 1 | ||||
| -rw-r--r-- | robolectric/src/main/java/org/robolectric/internal/SdkConfig.java | 4 | ||||
| -rw-r--r-- | run_robolectric_module_tests.mk | 3 | ||||
| -rw-r--r-- | run_robotests.mk | 3 |
4 files changed, 8 insertions, 3 deletions
diff --git a/processor/sdks.txt b/processor/sdks.txt index e61922009..4bb647c0d 100644 --- a/processor/sdks.txt +++ b/processor/sdks.txt @@ -11,3 +11,4 @@ prebuilts/misc/common/robolectric/android-all/android-all-8.0.0_r4-robolectric-r prebuilts/misc/common/robolectric/android-all/android-all-8.1.0-robolectric-4611349.jar prebuilts/misc/common/robolectric/android-all/android-all-9-robolectric-4913185-2.jar prebuilts/misc/common/robolectric/android-all/android-all-9plus-robolectric-5616371.jar +prebuilts/misc/common/robolectric/android-all/android-all-R-beta2-robolectric-6625208.jar diff --git a/robolectric/src/main/java/org/robolectric/internal/SdkConfig.java b/robolectric/src/main/java/org/robolectric/internal/SdkConfig.java index 99ef10a92..d2cbf145a 100644 --- a/robolectric/src/main/java/org/robolectric/internal/SdkConfig.java +++ b/robolectric/src/main/java/org/robolectric/internal/SdkConfig.java @@ -31,7 +31,9 @@ public class SdkConfig implements Comparable<SdkConfig> { addSdk(Build.VERSION_CODES.P, "9", "4913185-2", "REL"); addSdk(Build.VERSION_CODES.Q, "10", "5803371", "REL"); // BEGIN-INTERNAL - addSdk(Build.VERSION_CODES.R, "R", "r0", "R"); + // TODO: Update jar with final R release. + addSdk(Build.VERSION_CODES.R, "R-beta2", "6625208", "REL"); + addSdk(Build.VERSION_CODES.S, "S", "r0", "S"); // END-INTERNAL } diff --git a/run_robolectric_module_tests.mk b/run_robolectric_module_tests.mk index 8bb5edf67..85a36d4f7 100644 --- a/run_robolectric_module_tests.mk +++ b/run_robolectric_module_tests.mk @@ -52,7 +52,8 @@ copy_android_all_jar_pairs := \ $(android_all_source_dir)/android-all-8.1.0-robolectric-4611349.jar:$(android_all_target_dir)/android-all-8.1.0-robolectric-4611349.jar \ $(android_all_source_dir)/android-all-9-robolectric-4913185-2.jar:$(android_all_target_dir)/android-all-9-robolectric-4913185-2.jar \ $(android_all_source_dir)/android-all-9plus-robolectric-5616371.jar:$(android_all_target_dir)/android-all-9plus-robolectric-5616371.jar \ - $(local_android_all_source_jar):$(android_all_target_dir)/android-all-R-robolectric-r0.jar + $(android_all_source_dir)/android-all-R-beta2-robolectric-6625208.jar:$(android_all_target_dir)/android-all-R-beta2-robolectric-6625208.jar \ + $(local_android_all_source_jar):$(android_all_target_dir)/android-all-S-robolectric-r0.jar copy_android_all_jars := $(call copy-many-files, $(copy_android_all_jar_pairs)) # If debugging the tests was requested, set up the JVM parameters to enable it. diff --git a/run_robotests.mk b/run_robotests.mk index 8e70760ac..5c0fefd1a 100644 --- a/run_robotests.mk +++ b/run_robotests.mk @@ -133,7 +133,8 @@ ifneq ($(DISABLE_ROBO_RUN_TESTS),true) $(android_all_lib_path)/android-all-8.1.0-robolectric-4611349.jar:$(my_robolectric_path)/android-all-8.1.0-robolectric-4611349.jar \ $(android_all_lib_path)/android-all-9-robolectric-4913185-2.jar:$(my_robolectric_path)/android-all-9-robolectric-4913185-2.jar \ $(android_all_lib_path)/android-all-10-robolectric-5803371.jar:$(my_robolectric_path)/android-all-10-robolectric-5803371.jar \ - $(local_android_all_source_jar):$(my_robolectric_path)/android-all-R-robolectric-r0.jar + $(android_all_lib_path)/android-all-R-beta2-robolectric-6625208.jar:$(my_robolectric_path)/android-all-R-beta2-robolectric-6625208.jar \ + $(local_android_all_source_jar):$(my_robolectric_path)/android-all-S-robolectric-r0.jar copy_android_all_jars := $(call copy-many-files, $(copy_android_all_jar_pairs)) $(my_target): $(copy_android_all_jars) |