openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Use python3 specifically for envsetup.sh"

This commit is contained in:
Treehugger Robot 2021-04-30 19:14:55 +00:00 committed by Gerrit Code Review
parent d19ec52207 4acbe3b416
commit 10b66f6975
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
envsetup.sh
View File

@ -1473,7 +1473,7 @@ function verifymodinfo() {
function allmod() { function allmod() {
verifymodinfo || return 1 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. # Get the path of a specific module in the android tree, as cached in module-info.json.
@ -1487,7 +1487,7 @@ function pathmod() {
verifymodinfo || return 1 verifymodinfo || return 1
local relpath=$(python -c "import json, os local relpath=$(python3 -c "import json, os
module = '$1' module = '$1'
module_info = json.load(open('$ANDROID_PRODUCT_OUT/module-info.json')) module_info = json.load(open('$ANDROID_PRODUCT_OUT/module-info.json'))
if module not in module_info: if module not in module_info:
@ -1513,7 +1513,7 @@ function dirmods() {
verifymodinfo || return 1 verifymodinfo || return 1
python -c "import json, os python3 -c "import json, os
dir = '$1' dir = '$1'
while dir.endswith('/'): while dir.endswith('/'):
dir = dir[:-1] dir = dir[:-1]
@ -1558,7 +1558,7 @@ function outmod() {
verifymodinfo || return 1 verifymodinfo || return 1
local relpath local relpath
relpath=$(python -c "import json, os relpath=$(python3 -c "import json, os
module = '$1' module = '$1'
module_info = json.load(open('$ANDROID_PRODUCT_OUT/module-info.json')) module_info = json.load(open('$ANDROID_PRODUCT_OUT/module-info.json'))
if module not in module_info: if module not in module_info: