diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2023-03-30 16:34:54 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-03-30 16:34:54 +0000 |
| commit | b0773c637207717a417257261e727b10bb9bbad5 (patch) | |
| tree | 9520a0e2ac9826d9a1cf1e1f8a72e71204818168 | |
| parent | ee30693ff6e35bc486edfa249340e37f06d9b468 (diff) | |
| parent | 1a766376ac2df98aef364c2478b447f9836d306c (diff) | |
| download | robolectric-shadows-b0773c637207717a417257261e727b10bb9bbad5.tar.gz | |
Merge "Support SDKs for Android 12.1 and 13" am: 1a766376ac
Original change: https://android-review.googlesource.com/c/platform/external/robolectric-shadows/+/2430853
Change-Id: I2d586400a0d76b71d1c82dd2585c8ca69ba9d890
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, 6 insertions, 0 deletions
diff --git a/processor/sdks.txt b/processor/sdks.txt index 985d2d5e3..3b4b80de4 100644 --- a/processor/sdks.txt +++ b/processor/sdks.txt @@ -13,3 +13,5 @@ prebuilts/misc/common/robolectric/android-all/android-all-9-robolectric-4913185- 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-12-robolectric-7732740.jar +prebuilts/misc/common/robolectric/android-all/android-all-12.1-robolectric-8229987.jar +prebuilts/misc/common/robolectric/android-all/android-all-13-robolectric-9030017.jar diff --git a/run_robolectric_module_tests.mk b/run_robolectric_module_tests.mk index 9e15ecdd4..0050c7326 100644 --- a/run_robolectric_module_tests.mk +++ b/run_robolectric_module_tests.mk @@ -54,6 +54,8 @@ copy_android_all_jar_pairs := \ $(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-12-robolectric-7732740.jar:$(android_all_target_dir)/android-all-12-robolectric-7732740.jar \ + $(android_all_source_dir)/android-all-12.1-robolectric-8229987.jar:$(android_all_target_dir)/android-all-12.1-robolectric-8229987.jar \ + $(android_all_source_dir)/android-all-13-robolectric-9030017.jar:$(android_all_target_dir)/android-all-13-robolectric-9030017.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 a7bc43d81..cb0db1b74 100644 --- a/run_robotests.mk +++ b/run_robotests.mk @@ -137,6 +137,8 @@ ifneq ($(DISABLE_ROBO_RUN_TESTS),true) $(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-12-robolectric-7732740.jar:$(my_robolectric_path)/android-all-12-robolectric-7732740.jar \ + $(android_all_lib_path)/android-all-12.1-robolectric-8229987.jar:$(my_robolectric_path)/android-all-12.1-robolectric-8229987.jar \ + $(android_all_lib_path)/android-all-13-robolectric-9030017.jar:$(my_robolectric_path)/android-all-13-robolectric-9030017.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)) |