Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(336)

Unified Diff: third_party/instrumented_libraries/instrumented_libraries.gyp

Issue 315563003: Instrumented libraries: fix & re-enable zlib1g build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | third_party/instrumented_libraries/zlib1g.diff » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/instrumented_libraries/instrumented_libraries.gyp
diff --git a/third_party/instrumented_libraries/instrumented_libraries.gyp b/third_party/instrumented_libraries/instrumented_libraries.gyp
index 1edfce812541b5b6d5a01b3934174719ede4a1f1..378adcd7fbb926aaae4e90f1b44311807dab01dc 100644
--- a/third_party/instrumented_libraries/instrumented_libraries.gyp
+++ b/third_party/instrumented_libraries/instrumented_libraries.gyp
@@ -73,8 +73,7 @@
'<(_sanitizer_type)-libxrender1',
'<(_sanitizer_type)-libxss1',
'<(_sanitizer_type)-libxtst6',
- # https://crbug.com/313751#c110
- #'<(_sanitizer_type)-zlib1g',
+ '<(_sanitizer_type)-zlib1g',
'<(_sanitizer_type)-libglib2.0-0',
'<(_sanitizer_type)-libdbus-1-3',
'<(_sanitizer_type)-libdbus-glib-1-2',
@@ -336,6 +335,7 @@
{
'library_name': 'zlib1g',
'dependencies=': [],
+ 'run_before_build': 'zlib1g.sh',
'includes': ['standard_instrumented_library_target.gypi'],
},
{
« no previous file with comments | « no previous file | third_party/instrumented_libraries/zlib1g.diff » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698