From a2d046bd0bf934c2e93713757e1c28318615a884 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Tue, 25 Jul 2023 11:46:47 +0530 Subject: [PATCH] Revert "fix(benchmark): upgrade to API level 33" This reverts commit 1defffa50421eebf9dcc3d77e94e15bcc5f2f6f8. --- .github/workflows/baseline-profile.yml | 4 ++-- benchmark/build.gradle.kts | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/baseline-profile.yml b/.github/workflows/baseline-profile.yml index a6d09220..ddda0e91 100644 --- a/.github/workflows/baseline-profile.yml +++ b/.github/workflows/baseline-profile.yml @@ -58,7 +58,7 @@ jobs: - name: Run benchmark on Gradle Managed Device run: | - ./gradlew baselineprofileBenchmarkAndroidTest \ + ./gradlew api31BenchmarkAndroidTest \ -Dorg.gradle.workers.max=1 \ -Pandroid.testInstrumentationRunnerArguments.androidx.benchmark.enabledRules=BaselineProfile \ -Pandroid.testoptions.manageddevices.emulator.gpu="swiftshader_indirect" @@ -71,7 +71,7 @@ jobs: # Pull down any changes which may have been committed while this workflow has been running git pull # Sort the baseline profile, output to android/ - sort -o android/src/main/baseline-prof.txt benchmark/build/outputs/managed_device_android_test_additional_output/benchmark/baselineprofile/BaselineProfileGenerator_generateBaselineProfile-baseline-prof.txt + sort -o android/src/main/baseline-prof.txt benchmark/build/outputs/managed_device_android_test_additional_output/benchmark/api31/BaselineProfileGenerator_generateBaselineProfile-baseline-prof.txt # If the baseline profile has changed, commit it if [[ $(git diff --stat android/src/main/baseline-prof.txt) != '' ]]; then git add android/src/main/baseline-prof.txt diff --git a/benchmark/build.gradle.kts b/benchmark/build.gradle.kts index b0bd6daf..6a12cadb 100644 --- a/benchmark/build.gradle.kts +++ b/benchmark/build.gradle.kts @@ -33,10 +33,10 @@ android { testOptions { managedDevices { devices { - create("baselineprofile") { - device = "Pixel 5" - apiLevel = 33 - systemImageSource = "google_apis" + create("api31") { + device = "Pixel 6" + apiLevel = 31 + systemImageSource = "aosp" } } }