diff options
author | Alexandru Croitor <alexandru.croitor@theqtcompany.com> | 2016-04-08 10:49:39 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-05-03 22:27:45 +0000 |
commit | 662d721dbca23809e821b4d5945187c2969db9e2 (patch) | |
tree | 33c52120d0ee1052da05da8dd6415426d0ca38ff /tools/scripts/take_snapshot.py | |
parent | 5bc43cb82a513befb681e25d49d169232ddfca88 (diff) |
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>
Diffstat (limited to 'tools/scripts/take_snapshot.py')
-rwxr-xr-x | tools/scripts/take_snapshot.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/tools/scripts/take_snapshot.py b/tools/scripts/take_snapshot.py index f5a1ed9d9..25b3dc15e 100755 --- a/tools/scripts/take_snapshot.py +++ b/tools/scripts/take_snapshot.py @@ -78,6 +78,7 @@ def isInChromiumBlacklist(file_path): or file_path.startswith('base/android/java') or file_path.startswith('breakpad') or file_path.startswith('build/android/') + or file_path.startswith('buildtools/clang_format/script') or (file_path.startswith('chrome/') and not file_path.startswith('chrome/VERSION') and not file_path.startswith('chrome/browser/chrome_notification_types.h') and @@ -204,6 +205,7 @@ def isInChromiumBlacklist(file_path): or file_path.startswith('third_party/trace-viewer') or file_path.startswith('third_party/undoview') or file_path.startswith('third_party/webgl') + or file_path.startswith('tools/memory_inspector') or (file_path.startswith('tools') and not file_path.startswith('tools/clang') and not file_path.startswith('tools/compile_test') and @@ -215,7 +217,10 @@ def isInChromiumBlacklist(file_path): not file_path.startswith('tools/json_comment_eater') and not file_path.startswith('tools/json_schema_compiler') and not file_path.startswith('tools/idl_parser') and - not file_path.startswith('tools/protoc_wrapper')) + not file_path.startswith('tools/memory') and + not file_path.startswith('tools/msan') and + not file_path.startswith('tools/protoc_wrapper') and + not file_path.startswith('tools/ubsan')) or file_path.startswith('ui/android/java') or file_path.startswith('ui/app_list') or file_path.startswith('ui/base/ime/chromeos') @@ -274,7 +279,7 @@ def listFilesInCurrentRepository(): for submodule in submodules: submodule_files = submodule.listFiles() for submodule_file in submodule_files: - files.append(os.path.join(submodule.path, submodule_file)) + files.append(os.path.join(submodule.pathRelativeToTopMostSupermodule(), submodule_file)) return files def exportNinja(): |