summaryrefslogtreecommitdiffstats
path: root/third_party/instrumented_libraries/instrumented_libraries.gyp
diff options
context:
space:
mode:
authorhoro@chromium.org <horo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-09 06:20:30 +0000
committerhoro@chromium.org <horo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-09 06:20:30 +0000
commit943a996f1de93d9de66b7fb02375702fdae6edf3 (patch)
treee7ebdf6aaf7b1206c863c1dce6fa14ff4e946c97 /third_party/instrumented_libraries/instrumented_libraries.gyp
parent8e19f0397480f93707c0d540d093487e86f57c69 (diff)
downloadchromium_src-943a996f1de93d9de66b7fb02375702fdae6edf3.zip
chromium_src-943a996f1de93d9de66b7fb02375702fdae6edf3.tar.gz
chromium_src-943a996f1de93d9de66b7fb02375702fdae6edf3.tar.bz2
Revert of Instrumented libraries: turn off leak detection when building with ASan. (https://codereview.chromium.org/376733006/)
Reason for revert: http://build.chromium.org/p/chromium.lkgr/builders/MSAN%20Release%20%28no%20origins%29/builds/41/steps/compile/logs/stdio FAILED: cd ../../third_party/instrumented_libraries; ../../third_party/instrumented_libraries/download_build_install.py "--product-directory=../../out/Release" "--package=libappindicator1" "--intermediate-directory=../../out/Release/obj/third_party/instrumented_libraries/msan-libappindicator1.gen" "--sanitizer-type=msan" "--extra-configure-flags=--disable-introspection" "--cflags=-O2 -gline-tables-only -fPIC -w -U_FORITFY_SOURCE \"-fsanitize=memory\" \"-fsanitize-memory-track-origins=0\"" "--ldflags=-Wl,-z,origin -Wl,-R,XORIGIN/. \"-fsanitize=memory\"" "--patch=" "--run-before-build=" "--cc=/mnt/data/b/build/goma/gomacc /mnt/data/b/build/slave/MSAN_Release__no_origins_/build/src/third_party/llvm-build/Release+Asserts/bin/clang" "--cxx=/mnt/data/b/build/goma/gomacc /mnt/data/b/build/slave/MSAN_Release__no_origins_/build/src/third_party/llvm-build/Release+Asserts/bin/clang++" "--jobs=1" "--build-method=destdir" "--sanitizer-blacklist=../../out/Release/../../tools/msan/blacklist.txt" Traceback (most recent call last): File "../../third_party/instrumented_libraries/download_build_install.py", line 366, in <module> main() File "../../third_party/instrumented_libraries/download_build_install.py", line 362, in main download_build_install(parsed_arguments) File "../../third_party/instrumented_libraries/download_build_install.py", line 262, in download_build_install environment = build_environment(parsed_arguments, install_prefix) File "../../third_party/instrumented_libraries/download_build_install.py", line 232, in build_environment product_directory, Original issue's description: > Instrumented libraries: turn off leak detection when building with ASan. > > Fixes a build failure. I also did some refactoring. > > BUG=313751 > TBR=glider@chromium.org > NOTRY=true > > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=281804 TBR=glider@chromium.org,earthdok@chromium.org NOTREECHECKS=true NOTRY=true BUG=313751 Review URL: https://codereview.chromium.org/380623002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@281977 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/instrumented_libraries/instrumented_libraries.gyp')
-rw-r--r--third_party/instrumented_libraries/instrumented_libraries.gyp1
1 files changed, 1 insertions, 0 deletions
diff --git a/third_party/instrumented_libraries/instrumented_libraries.gyp b/third_party/instrumented_libraries/instrumented_libraries.gyp
index 847f378..5c8309f 100644
--- a/third_party/instrumented_libraries/instrumented_libraries.gyp
+++ b/third_party/instrumented_libraries/instrumented_libraries.gyp
@@ -560,6 +560,7 @@
'--disable-introspection',
],
'dependencies=': [],
+ 'build_method': 'custom_libappindicator1',
'jobs': 1,
'includes': ['standard_instrumented_package_target.gypi'],
},