From 62f367348ff8ff1e64c6f52c1ee5f77c3a89edc1 Mon Sep 17 00:00:00 2001 From: weili Date: Fri, 14 Oct 2016 16:59:40 -0700 Subject: Ready to enable MSan build for PDFium Add all the necessary files used for MSan build and run. BUG=pdfium:1 Review-Url: https://codereview.chromium.org/2384353002 --- .gitignore | 1 + DEPS | 12 ++++++++++++ tools/msan/blacklist.txt | 5 +++++ 3 files changed, 18 insertions(+) create mode 100644 tools/msan/blacklist.txt diff --git a/.gitignore b/.gitignore index 154b6f2e27..c7facb8294 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ /third_party/android_ndk /third_party/catapult /third_party/icu +/third_party/instrumented_libraries /third_party/llvm /third_party/llvm-build /third_party/skia diff --git a/DEPS b/DEPS index b57ea2a702..51d5b6f3a4 100644 --- a/DEPS +++ b/DEPS @@ -14,6 +14,7 @@ vars = { 'gmock_revision': '29763965ab52f24565299976b936d1265cb6a271', 'gtest_revision': '8245545b6dc9c4703e6496d1efd19e975ad2b038', 'icu_revision': '2341038bf72869a5683a893a2b319a48ffec7f62', + 'instrumented_lib_revision': '45f5814b1543e41ea0be54c771e3840ea52cca4a', 'pdfium_tests_revision': '06411790a46e6497e5293f921ea9aa9fb2615e41', 'skia_revision': 'b55ebf071dce33794f5518dcdc3a9af006285796', 'tools_memory_revision': '427f10475e1a8d72424c29d00bf689122b738e5d', @@ -44,6 +45,9 @@ deps = { "third_party/icu": Var('chromium_git') + "/chromium/deps/icu.git@" + Var('icu_revision'), + "third_party/instrumented_libraries": + Var('chromium_git') + "/chromium/src/third_party/instrumented_libraries.git@" + Var('instrumented_lib_revision'), + "third_party/skia": Var('chromium_git') + '/skia.git' + '@' + Var('skia_revision'), @@ -180,4 +184,12 @@ hooks = [ 'pattern': '.', 'action': ['python', 'pdfium/build/vs_toolchain.py', 'update'], }, + { + # Pull sanitizer-instrumented third-party libraries if requested via + # GYP_DEFINES. + 'name': 'instrumented_libraries', + 'pattern': '\\.sha1', + 'action': ['python', 'pdfium/third_party/instrumented_libraries/scripts/download_binaries.py'], + }, + ] diff --git a/tools/msan/blacklist.txt b/tools/msan/blacklist.txt new file mode 100644 index 0000000000..64ef446df2 --- /dev/null +++ b/tools/msan/blacklist.txt @@ -0,0 +1,5 @@ +# The rules in this file are only applied at compile time. If you can modify the +# source in question, consider function attributes to disable instrumentation. +# +# Please think twice before you add or remove these rules. + -- cgit v1.2.3