StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make allmod() and pathmod() py3 compatible

Browse Source 
Change-Id: I8d58f2f64c03d54449844269974367f31de6ad31
This commit is contained in:
LuK1337
2020-01-12 03:12:17 +01:00
parent 56772d7213
commit b6a7819be6
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
envsetup.sh
View File

@@ -1342,7 +1342,7 @@ function allmod() {
refreshmod || return 1 refreshmod || return 1
fi fi
python -c "import json; print '\n'.join(sorted(json.load(open('$ANDROID_PRODUCT_OUT/module-info.json')).keys()))" python -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. If any build change # Get the path of a specific module in the android tree, as cached in module-info.json. If any build change
@@ -1368,7 +1368,7 @@ 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:
exit(1) exit(1)
print module_info[module]['path'][0]" 2>/dev/null) print(module_info[module]['path'][0])" 2>/dev/null)
if [ -z "$relpath" ]; then if [ -z "$relpath" ]; then
echo "Could not find module '$1' (try 'refreshmod' if there have been build changes?)." >&2 echo "Could not find module '$1' (try 'refreshmod' if there have been build changes?)." >&2