commit 9f6285c0e9e10e70729ac62c28fb12b53c02f805
author Kevin Wells <kevinwells@google.com> Tue Jan 15 15:58:09 2019 -0800
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Fri Jan 18 01:28:14 2019 +0000
tree 2929268d1b621d87d2a0c3814fd394f3a8c6ff56
parent a7daf11c1abe33e0169d0a9dbd3acad908c3b52b

[fx][delta] Invoke pm directly

Invoke pm directly instead of proxying through fx, similar to how
serve-updates invokes it.  When building product configs that don't
include pm, "fx pm" fails to find the binary.

Test: manual
Change-Id: Id585f52de81ca9c1cdd94ec127e5a0f5126c7763

devshell/delta

diff --git a/devshell/delta b/devshell/delta
index d7d5ab3..924c851 100755
--- a/devshell/delta
+++ b/devshell/delta
@@ -17,11 +17,13 @@
 source "$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"/lib/vars.sh || exit $?
 fx-config-read
 
+pm_bin="${FUCHSIA_BUILD_DIR}/host_x64/pm"
+
 function usage {
   fx-command-help delta
 
   echo
-  fx pm delta --help
+  "${pm_bin}" delta --help
 }
 
 function main {
@@ -77,7 +79,7 @@
     }
   fi
 
-  fx pm delta "${delta_args[@]}" "${source_path}" "${target_path}"
+  "${pm_bin}" delta "${delta_args[@]}" "${source_path}" "${target_path}"
 }
 
 main "$@"