diff options
| author | Colin Cross <ccross@android.com> | 2020-02-13 01:05:05 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-02-13 01:05:05 +0000 |
| commit | ab156e4e6b8e5f76232ea8ed13ec305c3eb05860 (patch) | |
| tree | 4f6db52675203f4ae94049ea20b8d509bc4a0e17 | |
| parent | 00c493f147935aaed0750aacb23ccc5699bc230e (diff) | |
| parent | 9f914a4214d1947ef35b874575f7a9a0198ffad4 (diff) | |
| download | platform_external_robolectric-shadows-ab156e4e6b8e5f76232ea8ed13ec305c3eb05860.tar.gz platform_external_robolectric-shadows-ab156e4e6b8e5f76232ea8ed13ec305c3eb05860.tar.bz2 platform_external_robolectric-shadows-ab156e4e6b8e5f76232ea8ed13ec305c3eb05860.zip | |
Merge "Update robolectric Q stubs to final"
| -rw-r--r-- | robolectric/src/main/java/org/robolectric/internal/SdkConfig.java | 3 | ||||
| -rw-r--r-- | run_robotests.mk | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/robolectric/src/main/java/org/robolectric/internal/SdkConfig.java b/robolectric/src/main/java/org/robolectric/internal/SdkConfig.java index 556f885fd..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,7 @@ 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"); - // TODO(b/136679333): Update jar with final Q release. - addSdk(Build.VERSION_CODES.Q, "9plus", "5616371", "REL"); + addSdk(Build.VERSION_CODES.Q, "10", "5803371", "REL"); // BEGIN-INTERNAL addSdk(Build.VERSION_CODES.R, "R", "r0", "R"); // END-INTERNAL diff --git a/run_robotests.mk b/run_robotests.mk index b995fd46a..8e70760ac 100644 --- a/run_robotests.mk +++ b/run_robotests.mk @@ -132,7 +132,7 @@ 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 \ - $(android_all_lib_path)/android-all-9plus-robolectric-5616371.jar:$(my_robolectric_path)/android-all-9plus-robolectric-5616371.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)) |