diff options
| author | utzcoz <utzcoz@gmail.com> | 2023-02-08 19:27:38 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-02-08 19:27:38 +0000 |
| commit | 4bbee5d9ed05944408ce36713b70382ecb8febee (patch) | |
| tree | c344564035585f66d07592cce5f50a622e74fee0 | |
| parent | 8bdccc6086038518fc5a2743d0d3599f74b5129e (diff) | |
| parent | 93f701624a4b624a4711799872319a6779166bd7 (diff) | |
| download | robolectric-shadows-4bbee5d9ed05944408ce36713b70382ecb8febee.tar.gz | |
Use official android-all for Android 12 am: 01e8cb9fb7 am: 93f701624a
Original change: https://android-review.googlesource.com/c/platform/external/robolectric-shadows/+/2419005
Change-Id: Ibb1c47e0555f2f2261497b49500b1b92cae2dab8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | processor/sdks.txt | 2 | ||||
| -rw-r--r-- | run_robolectric_module_tests.mk | 2 | ||||
| -rw-r--r-- | run_robotests.mk | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/processor/sdks.txt b/processor/sdks.txt index d1fb683ef..985d2d5e3 100644 --- a/processor/sdks.txt +++ b/processor/sdks.txt @@ -12,4 +12,4 @@ prebuilts/misc/common/robolectric/android-all/android-all-8.1.0-robolectric-4611 prebuilts/misc/common/robolectric/android-all/android-all-9-robolectric-4913185-2.jar prebuilts/misc/common/robolectric/android-all/android-all-10-robolectric-5803371.jar prebuilts/misc/common/robolectric/android-all/android-all-11-robolectric-6757853.jar -prebuilts/misc/common/robolectric/android-all/android-all-S-beta3-robolectric-7541949.jar +prebuilts/misc/common/robolectric/android-all/android-all-12-robolectric-7732740.jar diff --git a/run_robolectric_module_tests.mk b/run_robolectric_module_tests.mk index 784cdc4f6..9e15ecdd4 100644 --- a/run_robolectric_module_tests.mk +++ b/run_robolectric_module_tests.mk @@ -53,7 +53,7 @@ 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-10-robolectric-5803371.jar:$(android_all_target_dir)/android-all-10-robolectric-5803371.jar \ $(android_all_source_dir)/android-all-11-robolectric-6757853.jar:$(android_all_target_dir)/android-all-11-robolectric-6757853.jar \ - $(android_all_source_dir)/android-all-S-beta3-robolectric-7541949.jar:$(android_all_target_dir)/android-all-S-beta3-robolectric-7541949.jar \ + $(android_all_source_dir)/android-all-12-robolectric-7732740.jar:$(android_all_target_dir)/android-all-12-robolectric-7732740.jar \ $(local_android_all_source_jar):$(android_all_target_dir)/android-all-current-robolectric-r0.jar copy_android_all_jars := $(call copy-many-files, $(copy_android_all_jar_pairs)) diff --git a/run_robotests.mk b/run_robotests.mk index 6267af5a1..a7bc43d81 100644 --- a/run_robotests.mk +++ b/run_robotests.mk @@ -136,7 +136,7 @@ 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-11-robolectric-6757853.jar:$(my_robolectric_path)/android-all-11-robolectric-6757853.jar \ - $(android_all_lib_path)/android-all-S-beta3-robolectric-7541949.jar:$(my_robolectric_path)/android-all-S-beta3-robolectric-7541949.jar \ + $(android_all_lib_path)/android-all-12-robolectric-7732740.jar:$(my_robolectric_path)/android-all-12-robolectric-7732740.jar \ $(local_android_all_source_jar):$(my_robolectric_path)/android-all-current-robolectric-r0.jar copy_android_all_jars := $(call copy-many-files, $(copy_android_all_jar_pairs)) |