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

Merge "Fix cargo2android's license block preservation" am: dddc6e0873 am: 47aad36a67

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

Change-Id: Ida1a28ad198193c44c1c74de6f7d53f9c79b6193
This commit is contained in:
Treehugger Robot
2021-04-08 00:31:12 +00:00
committed by Automerger Merge Worker
parent 519c2e0fdc 47aad36a67
commit f322c46ffa
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()