diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-13 04:35:23 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-13 04:35:23 +0000 |
| commit | 531c7713f30f107efd104cd133877f6a67f5ef35 (patch) | |
| tree | 12d9803fb2fc7e8b1d304429b8fe2b9df4840f28 | |
| parent | 6d7a7e852cf8adb91f8162290e5a41031dcd78ec (diff) | |
| parent | 0c90a07b19f96d5832335f7e19bc37d121ad89bb (diff) | |
| download | platform_external_robolectric-shadows-531c7713f30f107efd104cd133877f6a67f5ef35.tar.gz platform_external_robolectric-shadows-531c7713f30f107efd104cd133877f6a67f5ef35.tar.bz2 platform_external_robolectric-shadows-531c7713f30f107efd104cd133877f6a67f5ef35.zip | |
Update robolectric Q stubs to final and add R am: 1104043674 am: 0c90a07b19
Change-Id: I899b97daf3ad8202056fee5de6e76e636e0acb07
| -rw-r--r-- | robolectric/src/main/java/org/robolectric/internal/SdkConfig.java | 3 | ||||
| -rw-r--r-- | run_robotests.mk | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/robolectric/src/main/java/org/robolectric/internal/SdkConfig.java b/robolectric/src/main/java/org/robolectric/internal/SdkConfig.java index 7002140f8..99ef10a92 100644 --- a/robolectric/src/main/java/org/robolectric/internal/SdkConfig.java +++ b/robolectric/src/main/java/org/robolectric/internal/SdkConfig.java @@ -29,8 +29,9 @@ public class SdkConfig implements Comparable<SdkConfig> { addSdk(Build.VERSION_CODES.O, "8.0.0_r4", "r1", "REL"); addSdk(Build.VERSION_CODES.O_MR1, "8.1.0", "4611349", "REL"); addSdk(Build.VERSION_CODES.P, "9", "4913185-2", "REL"); + addSdk(Build.VERSION_CODES.Q, "10", "5803371", "REL"); // BEGIN-INTERNAL - addSdk(Build.VERSION_CODES.Q, "Q", "r0", "Q"); + addSdk(Build.VERSION_CODES.R, "R", "r0", "R"); // END-INTERNAL } diff --git a/run_robotests.mk b/run_robotests.mk index 67a794846..8e70760ac 100644 --- a/run_robotests.mk +++ b/run_robotests.mk @@ -132,7 +132,8 @@ ifneq ($(DISABLE_ROBO_RUN_TESTS),true) $(android_all_lib_path)/android-all-8.0.0_r4-robolectric-r1.jar:$(my_robolectric_path)/android-all-8.0.0_r4-robolectric-r1.jar \ $(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 \ - $(local_android_all_source_jar):$(my_robolectric_path)/android-all-Q-robolectric-r0.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 copy_android_all_jars := $(call copy-many-files, $(copy_android_all_jar_pairs)) $(my_target): $(copy_android_all_jars) |