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

cargo2android: Fix edge case in --add_workspace feature

Browse Source 
If the last line of a Cargo.toml was a `[*]`, then appending
`[workspace]` without newlines would result in an invalid toml file.

external/crosvm/tracing/Cargo.toml is an example.

Test: ran on crosvm
Change-Id: Ib949e7f92d0205b1bc6433d1e231924832ddb536
This commit is contained in:
Frederick Mayle
2022-07-27 00:13:52 +00:00
parent 5a5aa3357a
commit 71722b10e5
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

@@ -1360,7 +1360,7 @@ class Runner(object):
print('### WARNING: found [workspace] in Cargo.toml') print('### WARNING: found [workspace] in Cargo.toml')
else: else:
with open(cargo_toml, 'a') as out_file: with open(cargo_toml, 'a') as out_file:
out_file.write('[workspace]\n') out_file.write('\n\n[workspace]\n')
added_workspace = True added_workspace = True
if self.args.verbose: if self.args.verbose:
print('### INFO: added [workspace] to Cargo.toml') print('### INFO: added [workspace] to Cargo.toml')