Merge "Make test_options.timeout an int64" am: c56651b345

am: 001b1c556d

Change-Id: I3ed30fbfadfd6c821bb7246d0abba19b9fb00ce6

diff --cc tests/robotests/Android.bp
index a86834f,f3312d2..28c987b
--- 1/tests/robotests/Android.bp
--- 2/tests/robotests/Android.bp
+++ b/tests/robotests/Android.bp
@@@ -1,77 -1,24 +1,77 @@@
 -//############################################
 -// Settings Robolectric test target.         #
 -//############################################
 +//############################################################
 +// Build SettingsRoboTestStub.apk which includes test-only resources.#
 +//############################################################
  
 -android_robolectric_test {
 -    name: "SettingsRoboTests",
 +android_app {
 +    name: "SettingsRoboTestStub",
 +    defaults: [
 +        "SettingsLibDefaults",
 +        "SettingsLib-search-defaults",
 +    ],
 +    platform_apis: true,
 +    certificate: "platform",
 +    privileged: true,
  
 -    srcs: ["src/**/*.java"],
 +    resource_dirs: ["res"],
  
 -    java_resource_dirs: ["config"],
 +    static_libs: [
 +        "Settings-core",
 +        "androidx-constraintlayout_constraintlayout",
 +        "androidx.slice_slice-builders",
 +        "androidx.slice_slice-core",
 +        "androidx.slice_slice-view",
 +        "androidx.core_core",
 +        "androidx.appcompat_appcompat",
 +        "androidx.cardview_cardview",
 +        "androidx.preference_preference",
 +        "androidx.recyclerview_recyclerview",
 +        "com.google.android.material_material",
 +        "setupcompat",
 +        "setupdesign",
 +        "androidx-constraintlayout_constraintlayout-solver",
 +        "androidx.lifecycle_lifecycle-runtime",
 +        "androidx.lifecycle_lifecycle-extensions",
 +        "guava",
 +        "jsr305",
 +        "settings-contextual-card-protos-lite",
 +        "settings-log-bridge-protos-lite",
 +        "contextualcards",
 +        "settings-logtags",
 +        "zxing-core-1.7",
 +    ],
 +
 +    aaptflags: ["--extra-packages com.android.settings"],
  
      libs: [
 -        "robolectric_android-all-stub",
 -        "Robolectric_all-target",
 -        "mockito-robolectric-prebuilt",
 -        "truth-prebuilt",
 +        "telephony-common",
 +        "ims-common",
      ],
 +}
  
 -    instrumentation_for: "Settings",
 +//############################################################
 +// Settings Robolectric test target.                         #
 +//############################################################
 +android_robolectric_test {
 +    name: "SettingsRoboTests",
 +    srcs: [
 +        "src/**/*.java",
 +    ],
 +
 +    static_libs: [
 +        "SettingsLib-robo-testutils",
 +    ],
 +
 +    java_resource_dirs: ["config"],
 +
 +    instrumentation_for: "SettingsRoboTestStub",
  
      test_options: {
-         timeout: "36000",
+         timeout: 36000,
      },
 +
 +    coverage_libs: [
 +        "Settings-core",
 +        "SettingsLib",
 +        "SettingsLib-search",
 +    ],
  }