diff options
| -rw-r--r-- | base/base.isolate | 9 | ||||
| -rw-r--r-- | build/android/pylib/utils/isolator.py | 1 | ||||
| -rw-r--r-- | build/isolate.gypi | 2 | ||||
| -rw-r--r-- | third_party/instrumented_libraries/instrumented_libraries.isolate | 22 |
4 files changed, 27 insertions, 7 deletions
diff --git a/base/base.isolate b/base/base.isolate index a245819..c7ba651 100644 --- a/base/base.isolate +++ b/base/base.isolate @@ -7,6 +7,8 @@ # itself, virtually all targets using it has to include icu. The only # exception is the Windows sandbox (?). '../third_party/icu/icu.isolate', + # Sanitizer-instrumented third-party libraries (if enabled). + '../third_party/instrumented_libraries/instrumented_libraries.isolate', ], 'conditions': [ ['use_custom_libcxx==1', { @@ -16,13 +18,6 @@ ], }, }], - ['use_instrumented_libraries==1', { - 'variables': { - 'files': [ - '<(PRODUCT_DIR)/instrumented_libraries/', - ], - }, - }], ['OS=="mac" and asan==1', { 'variables': { 'files': [ diff --git a/build/android/pylib/utils/isolator.py b/build/android/pylib/utils/isolator.py index fcbe427..dbbef5c 100644 --- a/build/android/pylib/utils/isolator.py +++ b/build/android/pylib/utils/isolator.py @@ -39,6 +39,7 @@ def DefaultConfigVariables(): 'tsan': '0', 'use_custom_libcxx': '0', 'use_instrumented_libraries': '0', + 'use_prebuilt_instrumented_libraries': '0', 'use_openssl': '0', 'use_ozone': '0', 'use_x11': '0', diff --git a/build/isolate.gypi b/build/isolate.gypi index 5fa1e67..f66175a 100644 --- a/build/isolate.gypi +++ b/build/isolate.gypi @@ -93,6 +93,8 @@ '--config-variable', 'tsan=<(tsan)', '--config-variable', 'use_custom_libcxx=<(use_custom_libcxx)', '--config-variable', 'use_instrumented_libraries=<(use_instrumented_libraries)', + '--config-variable', + 'use_prebuilt_instrumented_libraries=<(use_prebuilt_instrumented_libraries)', '--config-variable', 'use_openssl=<(use_openssl)', '--config-variable', 'use_ozone=<(use_ozone)', '--config-variable', 'use_x11=<(use_x11)', diff --git a/third_party/instrumented_libraries/instrumented_libraries.isolate b/third_party/instrumented_libraries/instrumented_libraries.isolate new file mode 100644 index 0000000..e6d8b9e --- /dev/null +++ b/third_party/instrumented_libraries/instrumented_libraries.isolate @@ -0,0 +1,22 @@ +# Copyright 2015 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. +{ + 'conditions': [ + ['use_instrumented_libraries==1', { + 'variables': { + 'files': [ + '<(PRODUCT_DIR)/instrumented_libraries/', + ], + }, + }], + ['use_prebuilt_instrumented_libraries==1', { + 'variables': { + 'files': [ + '<(PRODUCT_DIR)/instrumented_libraries_prebuilt/', + ], + }, + }], + ], +} + |