Get additional sanitizer dependencies from upstream chromium.

The buildtools directory contains custom libc++ libraries, which are a
second-level git submodule (the first-level being the buildtools
submodule, and the supermodule being chromium itself). The
init_repository.py script does not support checking out submodules
recursively, thus leading to the mentioned libraries being skipped.

This change adds a hardcoded addition to make sure the buildtools
submodules are checked out when init_repository is run, as well as
support for copying all nested files in the submodule tree, when the
take_snapshot script is executed. Thus it copies all necessary
sanitizer dependencies.

Change-Id: Icb5cf5b52c3d0a83c4690fb7d641cee4f5dc1132
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>

1 files changed, 12 insertions, 0 deletions

diff --git a/tools/scripts/version_resolver.py b/tools/scripts/version_resolver.py
index 634fec23e..6029bbdc9 100644
--- a/tools/scripts/version_resolver.py
+++ b/tools/scripts/version_resolver.py
@@ -89,6 +89,18 @@ def readSubmodules():
     for sub in git_submodules:
         submodule_dict[sub.path] = sub
 
+    # Add buildtools submodules
+    buildtools_deps_file_path = "buildtools/DEPS"
+    if (os.path.isfile(buildtools_deps_file_path)):
+        with open(buildtools_deps_file_path, 'r') as buildtools_deps_file:
+            buildtools_deps = buildtools_deps_file.read()
+            if buildtools_deps:
+                buildtools_parser = GitSubmodule.DEPSParser()
+                buildtools_parser.topmost_supermodule_path_prefix = './buildtools/'
+                buildtools_submodules = buildtools_parser.parse(buildtools_deps)
+                for sub in buildtools_submodules:
+                    submodule_dict[sub.path] = sub
+
     # Remove unwanted upstream submodules
     for path in submodule_blacklist:
         if path in submodule_dict: