Fix cargo2android's license block preservation
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:
@@ -1131,8 +1131,8 @@ class Runner(object):
|
||||
# Firstly skip ANDROID_BP_HEADER
|
||||
while line.startswith('//'):
|
||||
line = intf.readline()
|
||||
# Read all lines until we see a rust_* rule.
|
||||
while line != '' and not line.startswith('rust_'):
|
||||
# Read all lines until we see a rust_* or genrule rule.
|
||||
while line != '' and not (line.startswith('rust_') or line.startswith('genrule {')):
|
||||
license += line
|
||||
line = intf.readline()
|
||||
return license.strip()
|
||||
|
||||
Reference in New Issue
Block a user