diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-09-27 18:15:57 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-09-27 18:15:57 +0000 |
| commit | 9c92f7827ea44143a6c07f057c0133cb66b0886e (patch) | |
| tree | c6a4d9885e20e0780f83c67873cdf813f2aa8cd1 | |
| parent | 7cec5eb74233351a3c935e2fc2b92c45be9a1f61 (diff) | |
| parent | fb30f3cf8662e78e3e84f9e2454d22b4dc98f252 (diff) | |
| download | buildSrc-emu-32-release.tar.gz | |
Merge cherrypicks of [2232568] into emu-32-release.emu-32-release
Change-Id: I094d0649899ee73385b53272adad4310a535a36c
| -rwxr-xr-x | servers/build_tools.py | 29 |
1 files changed, 23 insertions, 6 deletions
diff --git a/servers/build_tools.py b/servers/build_tools.py index 80fac3b..11b88bf 100755 --- a/servers/build_tools.py +++ b/servers/build_tools.py @@ -51,12 +51,29 @@ def install_deps(): if not os.path.exists(site.USER_SITE): os.makedirs(site.USER_SITE) - run( - [PYTHON_EXE, "setup.py", "develop", "--user"], - {}, - "dep", - os.path.join(AOSP_ROOT, "external", "qemu", "android", "build", "python"), - ) + try: + run( + [ + PYTHON_EXE, + "-m", + "pip", + "install", + "-e", + ".", + "--user", + ], + {}, + "dep", + os.path.join(AOSP_ROOT, "external", "qemu", "android", "build", "python"), + ) + except: + run( + [PYTHON_EXE, "setup.py", "develop", "--user"], + {}, + "dep", + os.path.join(AOSP_ROOT, "external", "qemu", "android", "build", "python"), + ) + class LogBelowLevel(logging.Filter): |