Fix: pass adb path to mobile-install launcher and canonicalize

Path to `adb` was not being sent to MI launcher. This caused it
to use the default `/usr/bin/adb`, which is not always valid.

stacked-branch: mi-adb-path

Author: pswaminathan

mobile_install/launcher_direct.bzl

@@ -15,6 +15,7 @@
 
 load("//rules:visibility.bzl", "PROJECT_VISIBILITY")
 load("//rules/flags:flags.bzl", "flags")
+load("//rules:utils.bzl", "get_android_toolchain")
 load(":deploy_info.bzl", "make_deploy_info_pb")
 load(":providers.bzl", "MIAppLaunchInfo")
 load(":utils.bzl", "utils")
@@ -65,6 +66,7 @@ def _make_app_runner(
         manifest_package_name_path,
         out_launcher,
         out_launcher_flags,
+        adb_path,
         splits = None,
         deploy_info_pb = None,
         test_apk = None,
@@ -89,6 +91,7 @@ def _make_app_runner(
     args["studio_deployer"] = getattr(ctx.file._studio_deployer, path_type)
     args["use_adb_root"] = str(use_adb_root).lower()
     args["use_studio_deployer"] = str(use_studio_deployer).lower()
+    args["adb"] = adb_path
 
     if test_data:
         args["data_files"] = ",".join([f.short_path for f in test_data])
@@ -146,6 +149,9 @@ def make_direct_launcher(
 
     runfiles.extend([launcher, launcher_flags])
 
+    adb = get_android_toolchain(ctx).adb
+    runfiles.extend(adb.files.to_list())
+
     runfiles.append(ctx.file._studio_deployer)
     if getattr(mi_app_info, "merged_manifest", None):
         runfiles.append(mi_app_info.merged_manifest)
@@ -178,6 +184,7 @@ def make_direct_launcher(
         mi_app_info.manifest_package_name,
         launcher,
         launcher_flags,
+        adb.files_to_run.executable.path,
         splits = splits,
         deploy_info_pb = deploy_info_pb,
         test_apk = test_apk,

src/tools/mi/deployment_oss/deploy_binary.go

@@ -22,6 +22,7 @@ import (
 	"log"
 	"os"
 	"os/exec"
+	"path/filepath"
 	"strings"
 	"time"
 
@@ -122,6 +123,18 @@ func main() {
 
 	flag.Parse()
 
+	var (
+		realPath string
+		err      error
+	)
+	if realPath, err = filepath.EvalSymlinks(*adbPath); err != nil {
+		glog.Exitf("Unable to dereference adb path: %s", err.Error())
+	}
+	if realPath, err = filepath.Abs(realPath); err != nil {
+		glog.Exitf("Unable to canonicalize adb path: %s", err.Error())
+	}
+	*adbPath = realPath
+
 	pprint.Info("Deploying using OSS mobile-install!")
 
 	if *noDeploy {