diff options
| author | 2024-11-13 17:00:24 +0000 | |
|---|---|---|
| committer | 2024-11-13 17:00:24 +0000 | |
| commit | d35506256cad0bbca250ca910f6751e6e6857a6e (patch) | |
| tree | a81028a1e09ce80ac4e11d99bf0c4891f69ce08a | |
| parent | a5878cc2b0d4692f8500012cf42f724bd71a3bea (diff) | |
| parent | 4dc28b3e38ff25637dbc9b1346818aa1fb75c898 (diff) | |
Merge "Update test to use pre jarjared library" into main
5 files changed, 5 insertions, 5 deletions
diff --git a/services/tests/mockingservicestests/Android.bp b/services/tests/mockingservicestests/Android.bp index 95acd75f32cc..993569fb17fe 100644 --- a/services/tests/mockingservicestests/Android.bp +++ b/services/tests/mockingservicestests/Android.bp @@ -78,7 +78,7 @@ android_test { "am_flags_lib", "device_policy_aconfig_flags_lib", ] + select(soong_config_variable("ANDROID", "release_crashrecovery_module"), { - "true": ["service-crashrecovery.impl"], + "true": ["service-crashrecovery-pre-jarjar"], default: [], }), diff --git a/services/tests/mockingservicestests/src/com/android/server/crashrecovery/Android.bp b/services/tests/mockingservicestests/src/com/android/server/crashrecovery/Android.bp index 1f88c29e2abc..8eae9c7d71fa 100644 --- a/services/tests/mockingservicestests/src/com/android/server/crashrecovery/Android.bp +++ b/services/tests/mockingservicestests/src/com/android/server/crashrecovery/Android.bp @@ -37,7 +37,7 @@ android_test { "truth", "flag-junit", ] + select(soong_config_variable("ANDROID", "release_crashrecovery_module"), { - "true": ["service-crashrecovery.impl"], + "true": ["service-crashrecovery-pre-jarjar"], default: [], }), diff --git a/services/tests/mockingservicestests/src/com/android/server/rollback/Android.bp b/services/tests/mockingservicestests/src/com/android/server/rollback/Android.bp index 2f23e02f5737..5a802d9de2ff 100644 --- a/services/tests/mockingservicestests/src/com/android/server/rollback/Android.bp +++ b/services/tests/mockingservicestests/src/com/android/server/rollback/Android.bp @@ -35,7 +35,7 @@ android_test { "truth", "flag-junit", ] + select(soong_config_variable("ANDROID", "release_crashrecovery_module"), { - "true": ["service-crashrecovery.impl"], + "true": ["service-crashrecovery-pre-jarjar"], default: [], }), diff --git a/services/tests/servicestests/Android.bp b/services/tests/servicestests/Android.bp index f1656678d3bd..0c058df35195 100644 --- a/services/tests/servicestests/Android.bp +++ b/services/tests/servicestests/Android.bp @@ -97,7 +97,7 @@ android_test { "com_android_server_accessibility_flags_lib", "locksettings_flags_lib", ] + select(soong_config_variable("ANDROID", "release_crashrecovery_module"), { - "true": ["service-crashrecovery.impl"], + "true": ["service-crashrecovery-pre-jarjar"], default: [], }), diff --git a/tests/PackageWatchdog/Android.bp b/tests/PackageWatchdog/Android.bp index 91483eb41387..8be74eaccd20 100644 --- a/tests/PackageWatchdog/Android.bp +++ b/tests/PackageWatchdog/Android.bp @@ -37,7 +37,7 @@ android_test { "truth", ] + select(soong_config_variable("ANDROID", "release_crashrecovery_module"), { "true": [ - "service-crashrecovery.impl", + "service-crashrecovery-pre-jarjar", "framework-crashrecovery.impl", ], default: [], |