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

c2a: Our cargo works again, re-enable defaulting.

Browse Source 
Bug: 234744235
Test: Run cargo2android.py without --cargo_bin
Test: Run in the sandbox without providing --cargo_bin
Change-Id: I4c3744e0e391ab7e4fb6a857483fde5c0015f0ff
This commit is contained in:
Matthew Maurer
2022-06-16 13:18:20 -07:00
parent 1231af292c
commit ce53b80d81
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/cargo2android.py
View File

@@ -1160,12 +1160,6 @@ class Runner(object):
sys.exit('ERROR: cannot find cargo in ' + self.args.cargo_bin) sys.exit('ERROR: cannot find cargo in ' + self.args.cargo_bin)
print('INFO: using cargo in ' + self.args.cargo_bin) print('INFO: using cargo in ' + self.args.cargo_bin)
return 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. # We have only tested this on Linux.
if platform.system() != 'Linux': if platform.system() != 'Linux':
sys.exit('ERROR: this script has only been tested on Linux with cargo.') sys.exit('ERROR: this script has only been tested on Linux with cargo.')