aboutsummaryrefslogtreecommitdiff
path: root/robolectric
diff options
context:
space:
mode:
authorVictor Chang <vichang@google.com>2020-07-03 16:35:02 +0100
committerVictor Chang <vichang@google.com>2020-07-10 00:10:27 +0100
commitb84738fc776d8934770b7d5e54aaa66171af269f (patch)
treed3c4a34f563ade045954382ec62e318189ff112f /robolectric
parent16e861acf2c34839a95958b1b216e0a2f7023a01 (diff)
downloadrobolectric-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
Diffstat (limited to 'robolectric')
-rw-r--r--robolectric/src/main/java/org/robolectric/internal/SdkConfig.java4
1 files changed, 3 insertions, 1 deletions
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
}