commit a46393129212b65c76140f0b0f0bafbbd5c4b6ca
author Chih-Hung Hsieh <chh@google.com> Thu Apr 27 22:52:35 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Apr 27 22:52:35 2017 +0000
tree 8f49f5e1606e6ebef2d0677d968021df5878fbbf
parent 925147dd7dd84a727b4d121bc9a8469d33dae83f
parent 5bc24ca63a74dd25104a0d26b2c918736fe600af

Merge "Get Android TOP from build.log file." am: 72a662a282
am: 5bc24ca63a

Change-Id: I5712b3d21d8ce5447883b0c70e0352794de8f4a2

tools/warn.py

diff --git a/tools/warn.py b/tools/warn.py
index 9cb115e..8aed830 100755
--- a/tools/warn.py
+++ b/tools/warn.py
@@ -2385,7 +2385,8 @@
 
 
 def parse_input_file(infile):
-  """Parse input file, match warning lines."""
+  """Parse input file, collect parameters and warning lines."""
+  global android_root
   global platform_version
   global target_product
   global target_variant
@@ -2412,6 +2413,9 @@
       m = re.search('(?<=^TARGET_BUILD_VARIANT=).*', line)
       if m is not None:
         target_variant = m.group(0)
+      m = re.search('.* TOP=([^ ]*) .*', line)
+      if m is not None:
+        android_root = m.group(1)
   return warning_lines