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

Merge "Require cargo_bin option" am: 9f75e2c9bc am: 65ba5606c1 am: a5b4fb5f79 am: 838af55a74

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

Change-Id: I778a0c61fe62c850fc063b0c3f2743e67f943298
This commit is contained in:
Thiébaud Weksteen
2022-02-09 05:13:17 +00:00
committed by Automerger Merge Worker
parent 832d90d98d 838af55a74
commit 23d1f97a22
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/cargo2android.py
View File

@@ -1152,8 +1152,14 @@ class Runner(object):
self.cargo_path = os.path.join(self.args.cargo_bin, 'cargo')
if not os.path.isfile(self.cargo_path):
sys.exit('ERROR: cannot find cargo in ' + self.args.cargo_bin)
print('WARNING: using 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.')