mobile-install: let the build step decide whether the IDE should deploy

(cherry picked from commit 3471b97)
hedronvision · Aug 13, 2022 · 3b2163c · 3b2163c
1 parent e1027f9
commit 3b2163c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/...blaze/android/run/binary/mobileinstall/BlazeAndroidBinaryMobileInstallRunContextBase.java b/...blaze/android/run/binary/mobileinstall/BlazeAndroidBinaryMobileInstallRunContextBase.java
@@ -88,7 +88,7 @@ public BlazeAndroidDeviceSelector getDeviceSelector() {
   @Override
   public void augmentLaunchOptions(LaunchOptions.Builder options) {
     options
-        .setDeploy(StudioDeployerExperiment.isEnabled())
+        .setDeploy(buildStep.needsIdeDeploy())
         .setOpenLogcatAutomatically(configState.showLogcatAutomatically());
     // This is needed for compatibility with #api211
     options.addExtraOptions(
@@ -110,15 +110,15 @@ public ApkBuildStep getBuildStep() {
     return buildStep;
   }
 
-  // @Override #api211
+  @Override
   public ProfilerState getProfileState() {
     return configState.getProfilerState();
   }
 
   @Override
   public ImmutableList<LaunchTask> getDeployTasks(IDevice device, LaunchOptions launchOptions)
       throws ExecutionException {
-    if (!StudioDeployerExperiment.isEnabled()) {
+    if (!buildStep.needsIdeDeploy()) {
       return ImmutableList.of();
     }
 

diff --git a/aswb/src/com/google/idea/blaze/android/run/binary/mobileinstall/MobileInstallBuildStep.java b/aswb/src/com/google/idea/blaze/android/run/binary/mobileinstall/MobileInstallBuildStep.java
@@ -262,6 +262,11 @@ public void build(BlazeContext context, BlazeAndroidDeviceSelector.DeviceSession
     }
   }
 
+  @Override
+  public boolean needsIdeDeploy() {
+    return StudioDeployerExperiment.isEnabled();
+  }
+
   @Override
   public BlazeAndroidDeployInfo getDeployInfo() throws ApkProvisionException {
     if (deployInfo != null) {

diff --git a/aswb/src/com/google/idea/blaze/android/run/runner/ApkBuildStep.java b/aswb/src/com/google/idea/blaze/android/run/runner/ApkBuildStep.java
@@ -27,5 +27,13 @@ public interface ApkBuildStep {
    */
   void build(BlazeContext context, BlazeAndroidDeviceSelector.DeviceSession deviceSession);
 
+  /**
+   * Returns whether the IDE should deploy the artifacts of the build. This is true in most cases
+   * except for mobile-install where the build itself does the deploy.
+   */
+  default boolean needsIdeDeploy() {
+    return true;
+  }
+
   BlazeAndroidDeployInfo getDeployInfo() throws ApkProvisionException;
 }