Update Baseline Profile generation

Author: keyboardsurfer

.github/workflows/macrobenchmark.yml

@@ -61,4 +61,6 @@ jobs:
             -Pandroid.testoptions.manageddevices.emulator.gpu="swiftshader_indirect" \
             -Pandroid.experimental.testOptions.managedDevices.setupTimeoutMinutes=180 \
             -Pandroid.experimental.androidTest.numManagedDeviceShards=1 \
-            -Pandroid.experimental.testOptions.managedDevices.maxConcurrentDevices=1
+            -Pandroid.experimental.testOptions.managedDevices.maxConcurrentDevices=1 \
+            -Pandroid.experimental.testOptions.managedDevices.emulator.showKernelLogging=true
+

MacrobenchmarkSample/app/build.gradle.kts

@@ -50,13 +50,14 @@ android {
             )
             // In real app, this would use its own release keystore
             signingConfig = signingConfigs.getByName("debug")
+            baselineProfile.automaticGenerationDuringBuild = true
         }
     }
     // [END macrobenchmark_setup_app_build_type]
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_21
-        targetCompatibility = JavaVersion.VERSION_21
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 }
 

MacrobenchmarkSample/macrobenchmark/build.gradle.kts

@@ -40,15 +40,16 @@ android {
     targetProjectPath = ":app"
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_21
-        targetCompatibility = JavaVersion.VERSION_21
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     testOptions.managedDevices.allDevices {
         create<ManagedVirtualDevice>("pixel6Api31") {
             device = "Pixel 6"
             apiLevel = 31
-            systemImageSource = "aosp"
+            systemImageSource = "aosp-atd"
+            testedAbi = "arm32-v8a"
         }
     }
     // [END_EXCLUDE]

MacrobenchmarkSample/macrobenchmark/src/main/kotlin/com/example/macrobenchmark/baselineprofile/LoginBaselineProfileGenerator.kt

@@ -40,10 +40,9 @@ class LoginBaselineProfileGenerator {
             stableIterations = 3
         ) {
             uiAutomator {
-                clearAppData()
                 startIntent(Intent("$packageName.LOGIN_ACTIVITY"))
-                onElement { textAsString() == "User: " }.text = "user"
-                onElement { textAsString() == "Password: " }.text = "password"
+                onElement { isEditable and !isPassword }.text = "user"
+                onElement { isEditable && isPassword }.text = "password"
                 onElement { textAsString() == "Login" }.click()
             }
         }

MacrobenchmarkSample/macrobenchmark/src/main/kotlin/com/example/macrobenchmark/baselineprofile/RecyclerViewActivityBaselineProfileGenerator.kt

@@ -16,20 +16,17 @@
 
 package com.example.macrobenchmark.baselineprofile
 
-import android.content.Intent
 import androidx.benchmark.macro.junit4.BaselineProfileRule
 import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
-import androidx.test.uiautomator.Direction
+import androidx.test.uiautomator.textAsString
 import androidx.test.uiautomator.uiAutomator
 import com.example.macrobenchmark.benchmark.util.TARGET_PACKAGE
-import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
-@Ignore // TODO causing stale object excpetion on CI .. why?
 @RunWith(AndroidJUnit4ClassRunner::class)
-class ComposeActivityBaselineProfileGenerator {
+class SampleBaselineProfileGenerator {
 
     @get:Rule
     val rule = BaselineProfileRule()
@@ -42,11 +39,20 @@ class ComposeActivityBaselineProfileGenerator {
             stableIterations = 3
         ) {
             uiAutomator {
-                // Start into the Compose Activity
-                startIntent(Intent("$TARGET_PACKAGE.COMPOSE_ACTIVITY"))
-                // Scrolling through the Compose journey
-                    onElement { viewIdResourceName == "myLazyColumn" }.fling(Direction.DOWN)
-                onElement { viewIdResourceName == "myLazyColumn" }.fling(Direction.UP)
+                startApp(TARGET_PACKAGE)
+                listOf(
+                    "Login",
+                    "ListView",
+                    "Compose",
+                    "ScrollView",
+                    "Fully Drawn",
+                    "RecyclerView",
+                    "Nested RecyclerView",
+                    "Nested RecyclerView with Pools"
+                ).forEach {
+                    onElement { textAsString() == it }.click()
+                    pressBack()
+                }
             }
         }
     }