Merge changes I4c3744e0,I91d8de92 am: b1d8a2de5f am: ad73674f9d am: b164b09cb1 am: c01e8b38b1 am: cc27840a54
Original change: https://android-review.googlesource.com/c/platform/development/+/2129337
Change-Id: I48f0eb060389643f95262f914b25101c0df587bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/scripts/cargo2android.py b/scripts/cargo2android.py
index 3071a10..fdd7bb6 100755
--- a/scripts/cargo2android.py
+++ b/scripts/cargo2android.py
@@ -1160,12 +1160,6 @@
sys.exit('ERROR: cannot find cargo in ' + self.args.cargo_bin)
print('INFO: using cargo in ' + self.args.cargo_bin)
return
- elif os.environ.get('ANDROID_BUILD_ENVIRONMENT_CONFIG', '') == 'googler':
- sys.exit('ERROR: Not executed within the sandbox. Please see '
- 'go/cargo2android-sandbox for more information.')
- else:
- sys.exit('ERROR: the prebuilt cargo is not usable; please '
- 'use the --cargo_bin flag.')
# We have only tested this on Linux.
if platform.system() != 'Linux':
sys.exit('ERROR: this script has only been tested on Linux with cargo.')
@@ -1205,10 +1199,10 @@
result = version_pat.match(dir_name)
if not result:
continue
- version = (result.group(1), result.group(2), result.group(3))
+ version = (int(result.group(1)), int(result.group(2)), int(result.group(3)))
if version > rust_version:
rust_version = version
- return '.'.join(rust_version)
+ return '.'.join(map(str, rust_version))
def find_out_files(self):
# list1 has build.rs output for normal crates
