Merge branch 'github/main'

benchmark/build.gradle.kts

@@ -13,8 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import com.google.samples.apps.nowinandroid.Flavor
+import com.android.build.api.dsl.ManagedVirtualDevice
-import com.google.samples.apps.nowinandroid.FlavorDimension
 import com.google.samples.apps.nowinandroid.configureFlavors
 
 plugins {
@@ -52,6 +51,18 @@ android {
 
     targetProjectPath = ":app"
     experimentalProperties["android.experimental.self-instrumenting"] = true
+
+    testOptions {
+        managedDevices {
+            devices {
+                create<ManagedVirtualDevice>("pixel5Api30") {
+                    device = "Pixel 5"
+                    apiLevel = 30
+                    systemImageSource = "aosp"
+                }
+            }
+        }
+    }
 }
 
 dependencies {