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

Merge "Support Python 3.8.10." am: f97a3286ec am: adfca40780 am: 0b0b5c407a

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/development/+/2624609

Change-Id: I82328d8b4f8c2a031e39289fa88248e234046ab2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-06-13 17:23:05 +00:00
committed by Automerger Merge Worker
parent 9f7b685cb3 0b0b5c407a
commit 965586b0c1
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
variant_data = {k.replace('-', '_') : v for k, v in self.args.variants[variant_num].items()}
# 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.
if self.variant_args.cargo: