diff options
| author | Colin Cross <ccross@android.com> | 2021-07-16 12:03:33 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2021-07-16 12:03:33 -0700 |
| commit | c2d0082595bcc589e735e86d01deca0c5e51ca05 (patch) | |
| tree | 6abbae0470ece52d750e972e085be716a26c0ee1 | |
| parent | 00c28488ea6c297204810c80e1a6e08a51d79985 (diff) | |
| download | robolectric-shadows-c2d0082595bcc589e735e86d01deca0c5e51ca05.tar.gz | |
Package prebuilt S robolectric runtime and T runtime from source
Package the prebuilt S runtime from beta3, and use T for the current
runtime.
Bug: 193252103
Test: m RunSettingsRoboTests
Change-Id: If889631b39cd256dad29923eea258a4cab642708
| -rw-r--r-- | processor/sdks.txt | 1 | ||||
| -rw-r--r-- | robolectric/src/main/java/org/robolectric/internal/SdkConfig.java | 3 | ||||
| -rw-r--r-- | run_robolectric_module_tests.mk | 3 | ||||
| -rw-r--r-- | run_robotests.mk | 3 |
4 files changed, 7 insertions, 3 deletions
diff --git a/processor/sdks.txt b/processor/sdks.txt index b9931ca3d..5444e46e9 100644 --- a/processor/sdks.txt +++ b/processor/sdks.txt @@ -13,3 +13,4 @@ prebuilts/misc/common/robolectric/android-all/android-all-9-robolectric-4913185- prebuilts/misc/common/robolectric/android-all/android-all-9plus-robolectric-5616371.jar prebuilts/misc/common/robolectric/android-all/android-all-10-robolectric-5803371.jar prebuilts/misc/common/robolectric/android-all/android-all-R-beta2-robolectric-6625208.jar +prebuilts/misc/common/robolectric/android-all/android-all-S-beta3-robolectric-7541949.jar diff --git a/robolectric/src/main/java/org/robolectric/internal/SdkConfig.java b/robolectric/src/main/java/org/robolectric/internal/SdkConfig.java index d2cbf145a..335617a13 100644 --- a/robolectric/src/main/java/org/robolectric/internal/SdkConfig.java +++ b/robolectric/src/main/java/org/robolectric/internal/SdkConfig.java @@ -33,7 +33,8 @@ public class SdkConfig implements Comparable<SdkConfig> { // BEGIN-INTERNAL // TODO: Update jar with final R release. addSdk(Build.VERSION_CODES.R, "R-beta2", "6625208", "REL"); - addSdk(Build.VERSION_CODES.S, "S", "r0", "S"); + addSdk(Build.VERSION_CODES.S, "S-beta3", "7541949", "REL"); + addSdk(Build.VERSION_CODES.TIRAMISU, "T", "r0", "T"); // END-INTERNAL } diff --git a/run_robolectric_module_tests.mk b/run_robolectric_module_tests.mk index 6cb0a24a7..67c6dfa79 100644 --- a/run_robolectric_module_tests.mk +++ b/run_robolectric_module_tests.mk @@ -53,7 +53,8 @@ copy_android_all_jar_pairs := \ $(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 \ $(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 + $(android_all_source_dir)/android-all-S-beta3-robolectric-7541949.jar:$(android_all_target_dir)/android-all-S-beta3-robolectric-7541949.jar \ + $(local_android_all_source_jar):$(android_all_target_dir)/android-all-T-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 af759a9a1..00c5f0cbc 100644 --- a/run_robotests.mk +++ b/run_robotests.mk @@ -136,7 +136,8 @@ ifneq ($(DISABLE_ROBO_RUN_TESTS),true) $(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 \ $(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 + $(android_all_lib_path)/android-all-S-beta3-robolectric-7541949.jar:$(my_robolectric_path)/android-all-S-beta3-robolectric-7541949.jar \ + $(local_android_all_source_jar):$(my_robolectric_path)/android-all-T-robolectric-r0.jar copy_android_all_jars := $(call copy-many-files, $(copy_android_all_jar_pairs)) $(my_target): $(copy_android_all_jars) |