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

Merge "Extend cargo2android.py version matching to include alpha and beta crates" am: 66f9ab6962 am: 2a9c4a2b22

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

Change-Id: I493c28066877c2151482f5fe99959b29b3c90090
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-02-03 23:03:23 +00:00
committed by Automerger Merge Worker
parent 2c8aeb3fd2 2a9c4a2b22
commit 05b9ae4eef
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: .*$')
# 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
C_LIBRARY_CRATE_TYPES = ['staticlib', 'cdylib']