diff options
| author | Rex Hoffman <rexhoffman@google.com> | 2023-03-15 21:58:43 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-03-15 21:58:43 +0000 |
| commit | 01af2f37f451e57662f3e4ddaf53fae365807171 (patch) | |
| tree | e6cb483c3f4cc887190a86552f423b7cc994c4bb | |
| parent | 53d3fc281d6ca9579891fad2bfe130e40cf66667 (diff) | |
| parent | 600b578e12971b19b8c876021dc13888f561c34e (diff) | |
| download | EmergencyInfo-01af2f37f451e57662f3e4ddaf53fae365807171.tar.gz | |
Upgrade robolectric to /external/robolectric to prep for removal of /external/robolectric shadows. am: 600b578e12
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/EmergencyInfo/+/21778422
Change-Id: Ic29316042f4d598d5c95da37a819ec48dac6f47a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | tests/robolectric/Android.bp | 2 | ||||
| -rw-r--r-- | tests/robolectric/config/robolectric.properties | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/tests/robolectric/Android.bp b/tests/robolectric/Android.bp index a4f52305..50350367 100644 --- a/tests/robolectric/Android.bp +++ b/tests/robolectric/Android.bp @@ -22,5 +22,5 @@ android_robolectric_test { java_resource_dirs: ["config"], static_libs: ["emergencyinfo-test-common"], instrumentation_for: "EmergencyInfo", - //upstream: true, + upstream: true, } diff --git a/tests/robolectric/config/robolectric.properties b/tests/robolectric/config/robolectric.properties index fab7251d..2a9e50df 100644 --- a/tests/robolectric/config/robolectric.properties +++ b/tests/robolectric/config/robolectric.properties @@ -1 +1,2 @@ sdk=NEWEST_SDK +instrumentedPackages=androidx.preference |