commit 4acbe3b4165eb84348a559e2b3e60f17c4f2852d
author Joe Onorato <joeo@google.com> Thu Apr 29 15:31:42 2021 -0700
committer Joe Onorato <joeo@google.com> Thu Apr 29 15:44:29 2021 -0700
tree 539190325f9767fecccca6138c0ec28d054e2529
parent d9d007b27194317610fd03d584b46e4f5c20a4cf

Use python3 specifically for envsetup.sh

Test: . build/envsetup.sh ; m <tab>
Change-Id: I94152c567f179fd7829bc675766e764624e5b7a3

envsetup.sh

diff --git a/envsetup.sh b/envsetup.sh
index b5c729d..e08fb03 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -1473,7 +1473,7 @@
 function allmod() {
     verifymodinfo || return 1
 
-    python -c "import json; print('\n'.join(sorted(json.load(open('$ANDROID_PRODUCT_OUT/module-info.json')).keys())))"
+    python3 -c "import json; print('\n'.join(sorted(json.load(open('$ANDROID_PRODUCT_OUT/module-info.json')).keys())))"
 }
 
 # Get the path of a specific module in the android tree, as cached in module-info.json.
@@ -1487,7 +1487,7 @@
 
     verifymodinfo || return 1
 
-    local relpath=$(python -c "import json, os
+    local relpath=$(python3 -c "import json, os
 module = '$1'
 module_info = json.load(open('$ANDROID_PRODUCT_OUT/module-info.json'))
 if module not in module_info:
@@ -1513,7 +1513,7 @@
 
     verifymodinfo || return 1
 
-    python -c "import json, os
+    python3 -c "import json, os
 dir = '$1'
 while dir.endswith('/'):
     dir = dir[:-1]
@@ -1558,7 +1558,7 @@
     verifymodinfo || return 1
 
     local relpath
-    relpath=$(python -c "import json, os
+    relpath=$(python3 -c "import json, os
 module = '$1'
 module_info = json.load(open('$ANDROID_PRODUCT_OUT/module-info.json'))
 if module not in module_info: