diff options
| author | Rex Hoffman <rexhoffman@google.com> | 2022-11-15 20:40:59 +0000 |
|---|---|---|
| committer | Rex Hoffman <rexhoffman@google.com> | 2022-11-29 20:21:40 +0000 |
| commit | 1836a0371b7d9db873142a6885afa8bec4f3458b (patch) | |
| tree | 2ae8b5844632576683618618bf1bd1d6ecf1d3cf | |
| parent | fdfe959b4b58e23774afe28c770dda12658ee932 (diff) | |
| download | robolectric-1836a0371b7d9db873142a6885afa8bec4f3458b.tar.gz | |
Enable new_robolectric
Use up to date prebuilts.
Shouldn't make it to aosp/master, but no harm if it does. Using merged in of previous cl... should work?
Test: mma in /external/robolectric
Bug: 244627502
Change-Id: Ib9d895258de0ab7423451445fc325a387e21ecf8
Merged-In: Ib9d895258de0ab7423451445fc325a387e21ecf8
| -rw-r--r-- | processor/Android.bp | 6 | ||||
| -rw-r--r-- | shadows/framework/Android.bp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/processor/Android.bp b/processor/Android.bp index ecfb93230..9d2832292 100644 --- a/processor/Android.bp +++ b/processor/Android.bp @@ -28,10 +28,10 @@ java_library_host { "asm-commons-9.2", "guava", "asm-tree-9.2", - "gson", + "gson-prebuilt-jar-2.9.1", "asm-9.2", "jsr305", - "auto_common", + "auto-common-1.1.2", ], openjdk9: { @@ -69,7 +69,7 @@ java_test_host { "objenesis", "junit", "truth-prebuilt", - "gson", + "gson-prebuilt-jar-2.9.1", "jsr305", ], diff --git a/shadows/framework/Android.bp b/shadows/framework/Android.bp index 5b6c1493f..04ba8ff71 100644 --- a/shadows/framework/Android.bp +++ b/shadows/framework/Android.bp @@ -60,8 +60,8 @@ java_library_host { "robolectric-host-android_all_upstream", ], plugins: [ - "auto_value_plugin", - "auto_value_builder_plugin", + "auto_value_plugin_1.9", + "auto_value_builder_plugin_1.9", "Robolectric_processor_upstream", ], |