commit 7b0961b3da4d4ffc4927547389d43a2034b778dd
author Alessio Balsini <balsini@google.com> Wed May 05 21:28:56 2021 +0100
committer Alessio Balsini <balsini@google.com> Tue Jun 08 10:41:45 2021 +0100
tree 857292880ec5b1f472a7e66af6221831bd208927
parent 1049e2fbdb587776a63b56ed6a55e0280a4e9ab9

android/tools: Update make_install parser with new syntax

With the new LTP version, make install commands have a slightly
different syntax, e.g., the destination path is no more using double
apexes.
Fix by updating the regex used for parsing the make install output.

Bug: 189092263
Test: android/tools/gen_android_build.sh
Signed-off-by: Alessio Balsini <balsini@google.com>
Change-Id: I082082a5f7f0c2acc3ba482887640fa3a241b861

android/tools/make_install_parser.py

diff --git a/android/tools/make_install_parser.py b/android/tools/make_install_parser.py
index a695fb8..bc94d7e 100644
--- a/android/tools/make_install_parser.py
+++ b/android/tools/make_install_parser.py
@@ -47,7 +47,7 @@
         Returns:
             string, directives in form install['target'] = [ 'srcfile' ]
         '''
-        pattern = re.compile(r'install -m \d+ "%s%s(.*)" "/opt/ltp/(.*)"' %
+        pattern = re.compile(r'install\s+-m\s+\d+\s+"%s%s(.+)"\s+/opt/ltp/(.+)' %
                              (os.path.realpath(self.ltp_root), os.sep))
         result = []