LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support Python 3.8.10.

Browse Source 
Redshell unfortunately uses this old version, while the union operator
for dictionaries was only added in Python 3.9.

Test: Ran cargo2android.py on a crate with variants
Change-Id: I7a875acde11c23a3b789ef384f3ab32100d7c6d5
This commit is contained in:
Andrew Walbran
2023-06-13 13:06:26 +00:00
parent 2876fbc6ed
commit 90bfd75d6b
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/cargo2android.py
View File

@@ -1339,7 +1339,7 @@ class Runner(object):
# Resolve - and _ for Namespace usage # Resolve - and _ for Namespace usage
variant_data = {k.replace('-', '_') : v for k, v in self.args.variants[variant_num].items()} variant_data = {k.replace('-', '_') : v for k, v in self.args.variants[variant_num].items()}
# Merge and overwrite variant args # Merge and overwrite variant args
self.variant_args = argparse.Namespace(**vars(self.args) | variant_data) self.variant_args = argparse.Namespace(**{**vars(self.args), **variant_data})
# Default action is cargo clean, followed by build or user given actions. # Default action is cargo clean, followed by build or user given actions.
if self.variant_args.cargo: if self.variant_args.cargo: