From 36d24ecca9dfe12a8c4d01772712e288797b3e2a Mon Sep 17 00:00:00 2001
From: mlykotom <mlykotom@google.com>
Date: Fri, 4 Nov 2022 12:41:10 +0100
Subject: [PATCH 1/2] Store run configuration for generating demo flavor
 Baseline Profile

---
 .run/Generate Demo Baseline Profile.run.xml | 23 +++++++++++++++++++++
 benchmark/build.gradle.kts                  |  6 +++---
 2 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 .run/Generate Demo Baseline Profile.run.xml

diff --git a/.run/Generate Demo Baseline Profile.run.xml b/.run/Generate Demo Baseline Profile.run.xml
new file mode 100644
index 000000000..ac47f3971
--- /dev/null
+++ b/.run/Generate Demo Baseline Profile.run.xml	
@@ -0,0 +1,23 @@
+<component name="ProjectRunConfigurationManager">
+  <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" />
+      <option name="scriptParameters" value="--rerun-tasks -Pandroid.testInstrumentationRunnerArguments.androidx.benchmark.enabledRules=BaselineProfile" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value=":benchmark:pixel6Api31DemoBenchmarkAndroidTest" />
+        </list>
+      </option>
+      <option name="vmOptions" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/benchmark/build.gradle.kts b/benchmark/build.gradle.kts
index 931fd6d00..0cbde5bd3 100644
--- a/benchmark/build.gradle.kts
+++ b/benchmark/build.gradle.kts
@@ -55,9 +55,9 @@ android {
     testOptions {
         managedDevices {
             devices {
-                create<ManagedVirtualDevice>("pixel5Api30") {
-                    device = "Pixel 5"
-                    apiLevel = 30
+                create<ManagedVirtualDevice>("pixel6Api31") {
+                    device = "Pixel 6"
+                    apiLevel = 31
                     systemImageSource = "aosp"
                 }
             }

From 886fa2a7fa703a883d386f5f36734328d6be7f97 Mon Sep 17 00:00:00 2001
From: mlykotom <mlykotom@google.com>
Date: Mon, 7 Nov 2022 14:52:05 +0100
Subject: [PATCH 2/2] Add comments to run configuration

---
 .run/Generate Demo Baseline Profile.run.xml | 23 ++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/.run/Generate Demo Baseline Profile.run.xml b/.run/Generate Demo Baseline Profile.run.xml
index ac47f3971..68174ea4b 100644
--- a/.run/Generate Demo Baseline Profile.run.xml	
+++ b/.run/Generate Demo Baseline Profile.run.xml	
@@ -1,9 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright 2022 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
 <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.
+  More information at http://d.android.com/baseline-profiles.
+  -->
   <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="taskDescriptions">
         <list />
@@ -20,4 +41,4 @@
     <DebugAllEnabled>false</DebugAllEnabled>
     <method v="2" />
   </configuration>
-</component>
\ No newline at end of file
+</component>