summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkharihar <karthik.harihar1@harman.corp-partner.google.com>2021-10-07 14:43:45 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-10-07 14:43:45 +0000
commit1c2e8f01c318526043d3c96492bd9f6be057c194 (patch)
tree771984586cf24e16bf024e33613283a2732d46c9
parentce12dc243e732b26dac4778a0b1c8b2c33c7910d (diff)
parent2788d326fe049beeb69845465635c24addcc0a20 (diff)
downloadvts-1c2e8f01c318526043d3c96492bd9f6be057c194.tar.gz
changed the protobuf as suggested in b/200098142 am: 0190d39520 am: 2788d326fe
Original change: https://android-review.googlesource.com/c/platform/test/vts/+/1842078 Change-Id: I3ae0ca1a7cd00bdb2891cdbd8a67acf5f21ad2cf
-rw-r--r--harnesses/tradefed/src/com/android/tradefed/targetprep/VtsPythonVirtualenvPreparer.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/harnesses/tradefed/src/com/android/tradefed/targetprep/VtsPythonVirtualenvPreparer.java b/harnesses/tradefed/src/com/android/tradefed/targetprep/VtsPythonVirtualenvPreparer.java
index b0789ab49..e9c9882e8 100644
--- a/harnesses/tradefed/src/com/android/tradefed/targetprep/VtsPythonVirtualenvPreparer.java
+++ b/harnesses/tradefed/src/com/android/tradefed/targetprep/VtsPythonVirtualenvPreparer.java
@@ -67,7 +67,7 @@ public class VtsPythonVirtualenvPreparer implements ITargetPreparer, ITargetClea
protected static final String VIRTUAL_ENV_PATH = "VIRTUALENVPATH";
private static final int BASE_TIMEOUT = 1000 * 60;
private static final String[] DEFAULT_DEP_MODULES = {"enum", "future", "futures",
- "google-api-python-client", "httplib2", "oauth2client", "protobuf", "requests"};
+ "google-api-python-client", "httplib2", "oauth2client", "protobuf==3.17.3", "requests"};
@Option(name = "venv-dir", description = "path of an existing virtualenv to use")
private File mVenvDir = null;