From b06dd5c7e2f6d112700453a5280bc2e4ca6badf1 Mon Sep 17 00:00:00 2001 From: Jeff Vander Stoep Date: Wed, 1 Feb 2023 14:09:58 +0100 Subject: [PATCH] c2a: make Rust version matchin regex less exact Allow custom version like 1.65.0.p1 (added in aosp/2404317). Resolves warning: WARNING: cannot find RustDefaultVersion in development/scripts/../../build/soong/rust/config/global.go Change-Id: I6fced7695473e025b0f739f9986df932d2c3f5fe Test: cargo2android.py --config cargo2android.py no warning Change-Id: I43ff81f061477fc0322f27fef1c950954130dbc6 --- scripts/cargo2android.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/cargo2android.py b/scripts/cargo2android.py index b3c96b0e0..750932aa2 100755 --- a/scripts/cargo2android.py +++ b/scripts/cargo2android.py @@ -1201,7 +1201,7 @@ class Runner(object): if os.path.isfile(path2global): # try to find: RustDefaultVersion = "1.44.0" version_pat = re.compile( - r'\s*RustDefaultVersion\s*=\s*"([0-9]+\.[0-9]+\.[0-9]+)".*$') + r'\s*RustDefaultVersion\s*=\s*"([0-9]+\.[0-9]+\.[0-9]+).*"') with open(path2global, 'r') as inf: for line in inf: result = version_pat.match(line)