commit 4ac83fad3cdc486c00199eef9ea2a95d354839c4
author Elliott Hughes <enh@google.com> Tue Jul 22 21:24:47 2014 -0700
committer Elliott Hughes <enh@google.com> Wed Jul 23 09:39:40 2014 -0700
tree 6564e39e0bca8613d39d1460ac1da84d0b7d45c6
parent 3ff6d95a9b26154c94b5cf130649cf99eb6a4010

Fix a couple of bugs in generate-NOTICE and regenerate the NOTICE files.

(cherry picked from commit 3758a244cf758046b40f630a11aed41e68c9cfc2)

Change-Id: I6ffb83b4a7b7746b095205c664cf025a72ead179

libc/tools/generate-NOTICE.py

diff --git a/libc/tools/generate-NOTICE.py b/libc/tools/generate-NOTICE.py
index 6d4c761..4c9e927 100755
--- a/libc/tools/generate-NOTICE.py
+++ b/libc/tools/generate-NOTICE.py
@@ -77,7 +77,7 @@
     for line in lines[start:end]:
         line = line.replace("\t", "    ")
         line = line.replace("/* ", "")
-        line = line.replace(" * ", "")
+        line = re.sub("^ \* ", "", line)
         line = line.replace("** ", "")
         line = line.replace("# ", "")
         if line.startswith("++Copyright++"):
@@ -144,7 +144,7 @@
 
             i = 0
             while i < len(lines):
-                if "Copyright" in lines[i]:
+                if "Copyright" in lines[i] and not "__COPYRIGHT" in lines[i]:
                     i = ExtractCopyrightAt(lines, i)
                 i += 1