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

Side by Side 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, 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | third_party/instrumented_libraries/zlib1g.diff » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 # Default value for all libraries. 6 # Default value for all libraries.
7 'extra_configure_flags': '', 7 'extra_configure_flags': '',
8 'extra_cflags': '', 8 'extra_cflags': '',
9 'extra_cxxflags': '', 9 'extra_cxxflags': '',
10 'extra_ldflags': '', 10 'extra_ldflags': '',
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 '<(_sanitizer_type)-libxdamage1', 66 '<(_sanitizer_type)-libxdamage1',
67 '<(_sanitizer_type)-libxdmcp6', 67 '<(_sanitizer_type)-libxdmcp6',
68 '<(_sanitizer_type)-libxext6', 68 '<(_sanitizer_type)-libxext6',
69 '<(_sanitizer_type)-libxfixes3', 69 '<(_sanitizer_type)-libxfixes3',
70 '<(_sanitizer_type)-libxi6', 70 '<(_sanitizer_type)-libxi6',
71 '<(_sanitizer_type)-libxinerama1', 71 '<(_sanitizer_type)-libxinerama1',
72 '<(_sanitizer_type)-libxrandr2', 72 '<(_sanitizer_type)-libxrandr2',
73 '<(_sanitizer_type)-libxrender1', 73 '<(_sanitizer_type)-libxrender1',
74 '<(_sanitizer_type)-libxss1', 74 '<(_sanitizer_type)-libxss1',
75 '<(_sanitizer_type)-libxtst6', 75 '<(_sanitizer_type)-libxtst6',
76 # https://crbug.com/313751#c110 76 '<(_sanitizer_type)-zlib1g',
77 #'<(_sanitizer_type)-zlib1g',
78 '<(_sanitizer_type)-libglib2.0-0', 77 '<(_sanitizer_type)-libglib2.0-0',
79 '<(_sanitizer_type)-libdbus-1-3', 78 '<(_sanitizer_type)-libdbus-1-3',
80 '<(_sanitizer_type)-libdbus-glib-1-2', 79 '<(_sanitizer_type)-libdbus-glib-1-2',
81 '<(_sanitizer_type)-nss', 80 '<(_sanitizer_type)-nss',
82 '<(_sanitizer_type)-libfontconfig1', 81 '<(_sanitizer_type)-libfontconfig1',
83 '<(_sanitizer_type)-pulseaudio', 82 '<(_sanitizer_type)-pulseaudio',
84 '<(_sanitizer_type)-libasound2', 83 '<(_sanitizer_type)-libasound2',
85 '<(_sanitizer_type)-pango1.0', 84 '<(_sanitizer_type)-pango1.0',
86 '<(_sanitizer_type)-libcap2', 85 '<(_sanitizer_type)-libcap2',
87 '<(_sanitizer_type)-libudev0', 86 '<(_sanitizer_type)-libudev0',
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
329 }, 328 },
330 { 329 {
331 'library_name': 'libxtst6', 330 'library_name': 'libxtst6',
332 'dependencies=': [], 331 'dependencies=': [],
333 'extra_configure_flags': '--disable-specs', 332 'extra_configure_flags': '--disable-specs',
334 'includes': ['standard_instrumented_library_target.gypi'], 333 'includes': ['standard_instrumented_library_target.gypi'],
335 }, 334 },
336 { 335 {
337 'library_name': 'zlib1g', 336 'library_name': 'zlib1g',
338 'dependencies=': [], 337 'dependencies=': [],
338 'run_before_build': 'zlib1g.sh',
339 'includes': ['standard_instrumented_library_target.gypi'], 339 'includes': ['standard_instrumented_library_target.gypi'],
340 }, 340 },
341 { 341 {
342 'library_name': 'nss', 342 'library_name': 'nss',
343 'dependencies=': [ 343 'dependencies=': [
344 '<(_sanitizer_type)-libnspr4', 344 '<(_sanitizer_type)-libnspr4',
345 ], 345 ],
346 'run_before_build': 'nss.sh', 346 'run_before_build': 'nss.sh',
347 'build_method': 'custom_nss', 347 'build_method': 'custom_nss',
348 'includes': ['standard_instrumented_library_target.gypi'], 348 'includes': ['standard_instrumented_library_target.gypi'],
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
504 '--with-gtk=3.0', 504 '--with-gtk=3.0',
505 '--disable-orbit', 505 '--disable-orbit',
506 # See above. 506 # See above.
507 '--disable-introspection', 507 '--disable-introspection',
508 ], 508 ],
509 'dependencies=': [], 509 'dependencies=': [],
510 'includes': ['standard_instrumented_library_target.gypi'], 510 'includes': ['standard_instrumented_library_target.gypi'],
511 }, 511 },
512 ], 512 ],
513 } 513 }
OLDNEW
« 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