commit b9f21ba1ed55e7d32e4e65b3e06f84bf92d42a3c
author Mike Frysinger <vapier@chromium.org> Wed May 12 18:54:24 2021
committer Commit Bot <commit-bot@chromium.org> Thu Jul 22 16:46:06 2021
tree f81efb6f43220520d2f724753d9018434ea3a4eb
parent a6f26f60be836e2870ed6f975231488502c7cbff

vpython_wrapper: new wrapper entry point

This is Python 2 wrapper for use in older branches.

BUG=chromium:1196328
TEST=`./bin/cros_sdk` in old firmware branch works

Change-Id: I2a81191db4b77ccaab7c92c33508faccce0e6d25
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2893104
Commit-Queue: LaMont Jones <lamontjones@chromium.org>
Reviewed-by: LaMont Jones <lamontjones@chromium.org>
Tested-by: LaMont Jones <lamontjones@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/3040610
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Greg Edelston <gredelston@google.com>
Commit-Queue: Greg Edelston <gredelston@google.com>

bin/cros_sdk

diff --git a/bin/cros_sdk b/bin/cros_sdk
index 72196ce..35486cb 120000
--- a/bin/cros_sdk
+++ b/bin/cros_sdk
@@ -1 +1 @@
-../scripts/wrapper.py
\ No newline at end of file
+../scripts/vpython_wrapper.py
\ No newline at end of file

scripts/cros_env_whitelist

diff --git a/scripts/cros_env_whitelist b/scripts/cros_env_whitelist
index 72196ce..955b59a 120000
--- a/scripts/cros_env_whitelist
+++ b/scripts/cros_env_whitelist
@@ -1 +1 @@
-../scripts/wrapper.py
\ No newline at end of file
+vpython_wrapper.py
\ No newline at end of file

scripts/vpython_wrapper.py

diff --git a/scripts/vpython_wrapper.py b/scripts/vpython_wrapper.py
new file mode 100755
index 0000000..5b44349
--- /dev/null
+++ b/scripts/vpython_wrapper.py
@@ -0,0 +1,51 @@
+#!/usr/bin/env vpython
+# Copyright 2021 The Chromium OS Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# NB: Do not add a ton of wheels here as it's shared among many programs.
+# Only list significant ones widely used by chromite.lib modules.
+#
+# For info on this syntax, see:
+# https://chromium.googlesource.com/infra/infra/+/HEAD/doc/users/vpython.md#available-wheels
+
+# [VPYTHON:BEGIN]
+# python_version: "2.7"
+#
+# wheel: <
+#   name: "infra/python/wheels/httplib2-py2_py3"
+#   version: "version:0.10.3"
+# >
+# wheel: <
+#   name: "infra/python/wheels/oauth2client-py2_py3"
+#   version: "version:3.0.0"
+# >
+# wheel: <
+#   name: "infra/python/wheels/pyasn1-py2_py3"
+#   version: "version:0.2.3"
+# >
+# wheel: <
+#   name: "infra/python/wheels/pyasn1_modules-py2_py3"
+#   version: "version:0.0.8"
+# >
+# wheel: <
+#   name: "infra/python/wheels/rsa-py2_py3"
+#   version: "version:3.4.2"
+# >
+# wheel: <
+#   name: "infra/python/wheels/six-py2_py3"
+#   version: "version:1.15.0"
+# >
+# [VPYTHON:END]
+
+"""Wrapper around chromite executable scripts that use vpython."""
+
+import wrapper
+
+
+def main():
+  wrapper.commandline.ScriptWrapperMain(wrapper.FindTarget)
+
+
+if __name__ == '__main__':
+  main()