Skip to content

GitLab

T
tangled
Commit a3e41cd4 authored by alextaran@chromium.org's avatar alextaran@chromium.org
Browse files
Options

Added more libraries to instrumented libraries build list. 

BUG=313751
R=glider@chromium.org
TBR=cpu@chromium.org

Review URL: https://codereview.chromium.org/105213004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242093 0039d316-1c4b-4281-b951-d872f2087c98
parent d23535dc
Show whitespace changes
Inline Side-by-side
Showing with 107 additions and 47 deletions
third_party/instrumented_libraries/instrumented_libraries.gyp
View file @ a3e41cd4
...@@ -7,12 +7,52 @@ ...@@ -7,12 +7,52 @@
'custom_configure_flags': '', 'custom_configure_flags': '',
'custom_linker_flags': '', 'custom_linker_flags': '',
# Some librraies should not be built before others, so these lists define
# the order to build them all.
# The problem is that if you configure libraries to be installed to
# the directory where some other libraries are installed, it could break
# the build. For example, zlib1g should not be installed before other
# libraries.
'first_order_libraries': [
'<(_sanitizer_type)-libcairo2',
'<(_sanitizer_type)-libexpat1',
'<(_sanitizer_type)-libffi6',
'<(_sanitizer_type)-libgcrypt11',
'<(_sanitizer_type)-libgpg-error0',
'<(_sanitizer_type)-libp11-kit0',
'<(_sanitizer_type)-libpcre3',
'<(_sanitizer_type)-libpixman-1-0',
'<(_sanitizer_type)-libpng12-0',
'<(_sanitizer_type)-libx11-6',
'<(_sanitizer_type)-libxau6',
'<(_sanitizer_type)-libxcb1',
'<(_sanitizer_type)-libxcomposite1',
'<(_sanitizer_type)-libxcursor1',
'<(_sanitizer_type)-libxdamage1',
'<(_sanitizer_type)-libxdmcp6',
'<(_sanitizer_type)-libxext6',
'<(_sanitizer_type)-libxfixes3',
'<(_sanitizer_type)-libxi6',
'<(_sanitizer_type)-libxinerama1',
'<(_sanitizer_type)-libxrandr2',
'<(_sanitizer_type)-libxrender1',
'<(_sanitizer_type)-libxss1',
'<(_sanitizer_type)-libxtst6',
],
'second_order_libraries': [
'<(_sanitizer_type)-zlib1g',
],
'variables': { 'variables': {
'verbose_libraries_build%': 0, 'verbose_libraries_build%': 0,
}, },
'conditions': [ 'conditions': [
['asan==1', { ['asan==1', {
'sanitizer_type': 'asan', 'sanitizer_type': 'asan',
'first_order_libraries': [
'<(_sanitizer_type)-libfontconfig1',
'<(_sanitizer_type)-libglib2.0-0',
],
}], }],
['msan==1', { ['msan==1', {
'sanitizer_type': 'msan', 'sanitizer_type': 'msan',
...@@ -30,32 +70,9 @@ ...@@ -30,32 +70,9 @@
'variables': { 'variables': {
'prune_self_dependency': 1, 'prune_self_dependency': 1,
}, },
'dependencies': [ 'dependencies=': [
'<(_sanitizer_type)-libpng12-0', '<@(_first_order_libraries)',
'<(_sanitizer_type)-libxau6', '<@(_second_order_libraries)',
'<(_sanitizer_type)-libxdmcp6',
'<(_sanitizer_type)-libx11-6',
'<(_sanitizer_type)-libxcb1',
'<(_sanitizer_type)-libxext6',
'<(_sanitizer_type)-libxi6',
'<(_sanitizer_type)-libxrandr2',
'<(_sanitizer_type)-libxrender1',
'<(_sanitizer_type)-libxtst6',
'<(_sanitizer_type)-libpixman-1-0',
'<(_sanitizer_type)-libp11-kit0',
'<(_sanitizer_type)-libgpg-error0',
'<(_sanitizer_type)-libexpat1',
'<(_sanitizer_type)-libffi6',
'<(_sanitizer_type)-libcairo2',
'<(_sanitizer_type)-libpcre3',
],
'conditions': [
['asan==1', {
'dependencies': [
'<(_sanitizer_type)-libfontconfig1',
'<(_sanitizer_type)-libglib2.0-0',
],
}],
], ],
'actions': [ 'actions': [
{ {
...@@ -74,45 +91,51 @@ ...@@ -74,45 +91,51 @@
], ],
}, },
{ {
'library_name': 'libpng12-0', 'library_name': 'libcairo2',
'dependencies=': [], 'dependencies=': [],
'custom_configure_flags': '--disable-gtk-doc',
'includes': ['standard_instrumented_library_target.gypi'], 'includes': ['standard_instrumented_library_target.gypi'],
}, },
{ {
'library_name': 'libpixman-1-0', 'library_name': 'libexpat1',
'dependencies=': [], 'dependencies=': [],
'includes': ['standard_instrumented_library_target.gypi'], 'includes': ['standard_instrumented_library_target.gypi'],
}, },
{ {
'library_name': 'libp11-kit0', 'library_name': 'libffi6',
'dependencies=': [], 'dependencies=': [],
'includes': ['standard_instrumented_library_target.gypi'], 'includes': ['standard_instrumented_library_target.gypi'],
}, },
{ {
'library_name': 'libgpg-error0', 'library_name': 'libfontconfig1',
'dependencies=': [], 'dependencies=': [],
'custom_configure_flags': '--disable-docs',
'includes': ['standard_instrumented_library_target.gypi'], 'includes': ['standard_instrumented_library_target.gypi'],
}, },
{ {
'library_name': 'libexpat1', 'library_name': 'libgcrypt11',
'dependencies=': [], 'dependencies=': [],
'custom_linker_flags': '-Wl,-z,muldefs',
'includes': ['standard_instrumented_library_target.gypi'], 'includes': ['standard_instrumented_library_target.gypi'],
}, },
{ {
'library_name': 'libffi6', 'library_name': 'libglib2.0-0',
'dependencies=': [], 'dependencies=': [],
'custom_configure_flags': [
'--disable-gtk-doc',
'--disable-gtk-doc-html',
'--disable-gtk-doc-pdf',
],
'includes': ['standard_instrumented_library_target.gypi'], 'includes': ['standard_instrumented_library_target.gypi'],
}, },
{ {
'library_name': 'libfontconfig1', 'library_name': 'libgpg-error0',
'dependencies=': [], 'dependencies=': [],
'custom_configure_flags': '--disable-docs',
'includes': ['standard_instrumented_library_target.gypi'], 'includes': ['standard_instrumented_library_target.gypi'],
}, },
{ {
'library_name': 'libcairo2', 'library_name': 'libp11-kit0',
'dependencies=': [], 'dependencies=': [],
'custom_configure_flags': '--disable-gtk-doc',
'includes': ['standard_instrumented_library_target.gypi'], 'includes': ['standard_instrumented_library_target.gypi'],
}, },
{ {
...@@ -125,30 +148,24 @@ ...@@ -125,30 +148,24 @@
'includes': ['standard_instrumented_library_target.gypi'], 'includes': ['standard_instrumented_library_target.gypi'],
}, },
{ {
'library_name': 'libxau6', 'library_name': 'libpixman-1-0',
'dependencies=': [], 'dependencies=': [],
'includes': ['standard_instrumented_library_target.gypi'], 'includes': ['standard_instrumented_library_target.gypi'],
}, },
{ {
'library_name': 'libglib2.0-0', 'library_name': 'libpng12-0',
'dependencies=': [], 'dependencies=': [],
'custom_configure_flags': [
'--disable-gtk-doc',
'--disable-gtk-doc-html',
'--disable-gtk-doc-pdf',
],
'includes': ['standard_instrumented_library_target.gypi'], 'includes': ['standard_instrumented_library_target.gypi'],
}, },
{ {
'library_name': 'libxdmcp6', 'library_name': 'libx11-6',
'dependencies=': [], 'dependencies=': [],
'custom_configure_flags': '--disable-docs', 'custom_configure_flags': '--disable-specs',
'includes': ['standard_instrumented_library_target.gypi'], 'includes': ['standard_instrumented_library_target.gypi'],
}, },
{ {
'library_name': 'libx11-6', 'library_name': 'libxau6',
'dependencies=': [], 'dependencies=': [],
'custom_configure_flags': '--disable-specs',
'includes': ['standard_instrumented_library_target.gypi'], 'includes': ['standard_instrumented_library_target.gypi'],
}, },
{ {
...@@ -157,12 +174,38 @@ ...@@ -157,12 +174,38 @@
'custom_configure_flags': '--disable-build-docs', 'custom_configure_flags': '--disable-build-docs',
'includes': ['standard_instrumented_library_target.gypi'], 'includes': ['standard_instrumented_library_target.gypi'],
}, },
{
'library_name': 'libxcomposite1',
'dependencies=': [],
'includes': ['standard_instrumented_library_target.gypi'],
},
{
'library_name': 'libxcursor1',
'dependencies=': [],
'includes': ['standard_instrumented_library_target.gypi'],
},
{
'library_name': 'libxdamage1',
'dependencies=': [],
'includes': ['standard_instrumented_library_target.gypi'],
},
{
'library_name': 'libxdmcp6',
'dependencies=': [],
'custom_configure_flags': '--disable-docs',
'includes': ['standard_instrumented_library_target.gypi'],
},
{ {
'library_name': 'libxext6', 'library_name': 'libxext6',
'dependencies=': [], 'dependencies=': [],
'custom_configure_flags': '--disable-specs', 'custom_configure_flags': '--disable-specs',
'includes': ['standard_instrumented_library_target.gypi'], 'includes': ['standard_instrumented_library_target.gypi'],
}, },
{
'library_name': 'libxfixes3',
'dependencies=': [],
'includes': ['standard_instrumented_library_target.gypi'],
},
{ {
'library_name': 'libxi6', 'library_name': 'libxi6',
'dependencies=': [], 'dependencies=': [],
...@@ -172,6 +215,11 @@ ...@@ -172,6 +215,11 @@
], ],
'includes': ['standard_instrumented_library_target.gypi'], 'includes': ['standard_instrumented_library_target.gypi'],
}, },
{
'library_name': 'libxinerama1',
'dependencies=': [],
'includes': ['standard_instrumented_library_target.gypi'],
},
{ {
'library_name': 'libxrandr2', 'library_name': 'libxrandr2',
'dependencies=': [], 'dependencies=': [],
...@@ -182,11 +230,23 @@ ...@@ -182,11 +230,23 @@
'dependencies=': [], 'dependencies=': [],
'includes': ['standard_instrumented_library_target.gypi'], 'includes': ['standard_instrumented_library_target.gypi'],
}, },
{
'library_name': 'libxss1',
'dependencies=': [],
'includes': ['standard_instrumented_library_target.gypi'],
},
{ {
'library_name': 'libxtst6', 'library_name': 'libxtst6',
'dependencies=': [], 'dependencies=': [],
'custom_configure_flags': '--disable-specs', 'custom_configure_flags': '--disable-specs',
'includes': ['standard_instrumented_library_target.gypi'], 'includes': ['standard_instrumented_library_target.gypi'],
}, },
{
'library_name': 'zlib1g',
'dependencies=': [
'<@(_first_order_libraries)',
],
'includes': ['standard_instrumented_library_target.gypi'],
},
], ],
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment