diff --git a/baseline-profile/build.gradle b/baseline-profile/build.gradle
index c37a790443..14f3521266 100644
--- a/baseline-profile/build.gradle
+++ b/baseline-profile/build.gradle
@@ -24,6 +24,11 @@ android {
     }
 
     testOptions.managedDevices.devices {
+        pixel7Api36(ManagedVirtualDevice) {
+            device = "Pixel 7"
+            apiLevel = 36
+            systemImageSource = "google"
+        }
         pixel6Api33(ManagedVirtualDevice) {
             device = "Pixel 6"
             apiLevel = 33
@@ -35,7 +40,7 @@ android {
 // This is the configuration block for the Baseline Profile plugin.
 // You can specify to run the generators on a managed devices or connected devices.
 baselineProfile {
-    managedDevices += "pixel6Api33"
+    managedDevices += ["pixel6Api33", "pixel7Api36"]
     useConnectedDevices = false
 }
 
diff --git a/compatLib/build.gradle b/compatLib/build.gradle
index 3f516a899e..689814bbfc 100644
--- a/compatLib/build.gradle
+++ b/compatLib/build.gradle
@@ -3,6 +3,7 @@ plugins {
 }
 
 android {
+    buildToolsVersion "35.0.1"
     namespace "app.lawnchair.compatlib"
 
     buildFeatures {
diff --git a/wmshell/build.gradle b/wmshell/build.gradle
index 4b3dc3bb2e..bf04faf5f6 100644
--- a/wmshell/build.gradle
+++ b/wmshell/build.gradle
@@ -5,6 +5,7 @@ plugins {
 }
 
 android {
+    buildToolsVersion "35.0.1"
     namespace "com.android.wm.shell"
     buildFeatures {
         aidl true