Merge "Fix cargo2android's license block preservation"

2021-04-07 21:39:51 +00:00
parent dbde427be6 d9d13b8309
commit dddc6e0873
1 changed files with 2 additions and 2 deletions
--- a/scripts/cargo2android.py
+++ b/scripts/cargo2android.py
@@ -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()