aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorutzcoz <utzcoz@gmail.com>2023-02-11 18:19:55 +0800
committerutzcoz <utzcoz@gmail.com>2023-03-04 08:25:12 +0000
commitb92829ea55d0024b54e6e5199d738ef193261646 (patch)
treea06c07ec96697783b8b008c0d165cd270011516f
parent5816abc58fe9a298417d9bd6a33ce9af2afc0dbe (diff)
downloadrobolectric-shadows-b92829ea55d0024b54e6e5199d738ef193261646.tar.gz
Support SDKs for Android 12.1 and 13
Test: TH Signed-off-by: utzcoz <utzcoz@gmail.com> Change-Id: Iffee16a69f1a924bd6b614574f0971d938bb8828
-rw-r--r--processor/sdks.txt2
-rw-r--r--run_robolectric_module_tests.mk2
-rw-r--r--run_robotests.mk2
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))