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

Extend cargo2android.py version matching to include alpha and beta crates

Browse Source 
The ring crate hasn't had a non-alpha release in over two years, and
may need to be updated to an alpha release.  Modify the version regex
in cargo2android.py to recognize the alpha version as part of the
version suffix.

Test: manually run cargo2android.py in redshell
Change-Id: If48d5be339d10bc3e6651485b0038b7219403077
This commit is contained in:
Colin Cross
2023-02-03 12:39:51 -08:00
parent b1fbcaf684
commit 602c2483a5
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

@@ -142,7 +142,7 @@ CARGO_TEST_LIST_END_PAT = re.compile('^(\d+) tests?, (\d+) benchmarks$')
CARGO2ANDROID_RUNNING_PAT = re.compile('^### Running: .*$') CARGO2ANDROID_RUNNING_PAT = re.compile('^### Running: .*$')
# Rust package name with suffix -d1.d2.d3(+.*)?. # Rust package name with suffix -d1.d2.d3(+.*)?.
VERSION_SUFFIX_PAT = re.compile(r'^(.*)-[0-9]+\.[0-9]+\.[0-9]+(?:\+.*)?$') VERSION_SUFFIX_PAT = re.compile(r'^(.*)-[0-9]+\.[0-9]+\.[0-9]+(?:-(alpha|beta)\.[0-9]+)?(?:\+.*)?$')
# Crate types corresponding to a C ABI library # Crate types corresponding to a C ABI library
C_LIBRARY_CRATE_TYPES = ['staticlib', 'cdylib'] C_LIBRARY_CRATE_TYPES = ['staticlib', 'cdylib']