From c9e764b0d8c6ce21361f984cbf0a5b369c3d56a1 Mon Sep 17 00:00:00 2001
From: mlykotom <mlykotom@google.com>
Date: Mon, 5 Dec 2022 14:50:08 +0100
Subject: [PATCH 1/2] Update to Gradle Wrapper 7.6

Change-Id: I020d73e89fcd6be6df4b25c348641f82b4a3a404
---
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ae04661ee..070cb702f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 56ccf930728460c86da671a5c11986ca07053149 Mon Sep 17 00:00:00 2001
From: mlykotom <mlykotom@google.com>
Date: Mon, 5 Dec 2022 14:57:09 +0100
Subject: [PATCH 2/2] Update run configuration

Change-Id: I7f2b4733ffe22dad680506218441e0bd9e10eafb
---
 .run/Generate Demo Baseline Profile.run.xml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/.run/Generate Demo Baseline Profile.run.xml b/.run/Generate Demo Baseline Profile.run.xml
index 68174ea4b..4c34e5a76 100644
--- a/.run/Generate Demo Baseline Profile.run.xml	
+++ b/.run/Generate Demo Baseline Profile.run.xml	
@@ -16,22 +16,27 @@
 -->
 <component name="ProjectRunConfigurationManager">
   <!--
-  Baseline Profiles improve code execution speed by around 30% from the first launch by avoiding interpretation and just-in-time (JIT) compilation steps for included code paths.
+  Baseline Profiles improve code execution speed by around 30% from the first launch by avoiding
+  interpretation and just-in-time (JIT) compilation steps for included code paths.
   More information at http://d.android.com/baseline-profiles.
+
+  In this run configuration we leverage rerun parameter that always reruns the requested task regardless of cache.
+  We also leverage enable-display parameter to be able to verify the generator works as intended.
   -->
   <configuration default="false" name="Generate Demo Baseline Profile" type="GradleRunConfiguration" factoryName="Gradle">
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
       <option name="externalSystemIdString" value="GRADLE" />
-      <!-- TODO Once we use Gradle wrapper 7.6, we can use rerun instead of rerun-tasks that will skip cache only for one task -->
-      <option name="scriptParameters" value="--rerun-tasks -Pandroid.testInstrumentationRunnerArguments.androidx.benchmark.enabledRules=BaselineProfile" />
+      <option name="scriptParameters" value="-Pandroid.testInstrumentationRunnerArguments.androidx.benchmark.enabledRules=BaselineProfile" />
       <option name="taskDescriptions">
         <list />
       </option>
       <option name="taskNames">
         <list>
           <option value=":benchmark:pixel6Api31DemoBenchmarkAndroidTest" />
+          <option value="--rerun" />
+          <option value="--enable-display" />
         </list>
       </option>
       <option name="vmOptions" />