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

Fix cargo2android's license block preservation

Browse Source 
The code that preserves license blocks currently also preserves
genrules if they come before a rust_ rule, causing them to be
duplicated.  Let's fix that.

Test: Upgrade some crates
Change-Id: Ie4f62cd04c2f1dd0de788db0ca5e77502fb3b4c8
This commit is contained in:
Joel Galenson
2021-04-05 11:27:55 -07:00
parent 57a9db7c48
commit d9d13b8309
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/cargo2android.py
View File

@@ -1131,8 +1131,8 @@ class Runner(object):
# Firstly skip ANDROID_BP_HEADER # Firstly skip ANDROID_BP_HEADER
while line.startswith('//'): while line.startswith('//'):
line = intf.readline() line = intf.readline()
# Read all lines until we see a rust_* rule. # Read all lines until we see a rust_* or genrule rule.
while line != '' and not line.startswith('rust_'): while line != '' and not (line.startswith('rust_') or line.startswith('genrule {')):
license += line license += line
line = intf.readline() line = intf.readline()
return license.strip() return license.strip()