Added more libraries to instrumented libraries build list.

third_party/instrumented_libraries/instrumented_libraries.gyp

Index: third_party/instrumented_libraries/instrumented_libraries.gyp
===================================================================
--- third_party/instrumented_libraries/instrumented_libraries.gyp	(revision 241532)
+++ third_party/instrumented_libraries/instrumented_libraries.gyp	(working copy)
@@ -5,6 +5,39 @@
 {
   # Default value for all libraries.
   'custom_configure_flags': '',
+  'custom_linker_flags': '',
+
+  # Some librraies should be built before others, so these lists define
+  # the order to build them all.

[Alexander Potapenko, 2013/12/18 15:42:13]

Please elaborate in the comments why we need two orders.
IIUC the problem is not that some libraries should be built before others (this
can be done using dependencies), but rather that some libraries mustn't be built
before others (e.g. zlib)

[alextaran1, 2013/12/18 16:15:01]

Done.

+  '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': {
     'verbose_libraries_build%': 0,
@@ -12,6 +45,10 @@
   'conditions': [
     ['asan==1', {
       'sanitizer_type': 'asan',
+      'first_order_libraries': [
+        '<(_sanitizer_type)-libfontconfig1',
+        '<(_sanitizer_type)-libglib2.0-0',
+      ],
     }],
     ['msan==1', {
       'sanitizer_type': 'msan',
@@ -29,33 +66,10 @@
       'variables': {
          'prune_self_dependency': 1,
       },
-      'dependencies': [
-        '<(_sanitizer_type)-libpng12-0',
-        '<(_sanitizer_type)-libxau6',
-        '<(_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',
+      'dependencies=': [
+        '<@(_first_order_libraries)',
+        '<@(_second_order_libraries)',
       ],
-      'conditions': [
-        ['asan==1', {
-          'dependencies': [
-            '<(_sanitizer_type)-libfontconfig1',
-            '<(_sanitizer_type)-libglib2.0-0',
-          ],
-        }],
-      ],
       'actions': [
         {
           'action_name': 'fix_rpaths',
@@ -73,45 +87,51 @@
       ],
     },
     {
-      'library_name': 'libpng12-0',
+      'library_name': 'libcairo2',
       'dependencies=': [],
+      'custom_configure_flags': '--disable-gtk-doc',
       'includes': ['standard_instrumented_library_target.gypi'],
     },
     {
-      'library_name': 'libpixman-1-0',
+      'library_name': 'libexpat1',
       'dependencies=': [],
       'includes': ['standard_instrumented_library_target.gypi'],
     },
     {
-      'library_name': 'libp11-kit0',
+      'library_name': 'libffi6',
       'dependencies=': [],
       'includes': ['standard_instrumented_library_target.gypi'],
     },
     {
-      'library_name': 'libgpg-error0',
+      'library_name': 'libfontconfig1',
       'dependencies=': [],
+      'custom_configure_flags': '--disable-docs',
       'includes': ['standard_instrumented_library_target.gypi'],
     },
     {
-      'library_name': 'libexpat1',
+      'library_name': 'libgcrypt11',
       'dependencies=': [],
+      'custom_linker_flags': '-Wl,-z,muldefs',
       'includes': ['standard_instrumented_library_target.gypi'],
     },
     {
-      'library_name': 'libffi6',
+      'library_name': 'libglib2.0-0',
       'dependencies=': [],
+      'custom_configure_flags': [
+        '--disable-gtk-doc',
+        '--disable-gtk-doc-html',
+        '--disable-gtk-doc-pdf',
+      ],
       'includes': ['standard_instrumented_library_target.gypi'],
     },
     {
-      'library_name': 'libfontconfig1',
+      'library_name': 'libgpg-error0',
       'dependencies=': [],
-      'custom_configure_flags': '--disable-docs',
       'includes': ['standard_instrumented_library_target.gypi'],
     },
     {
-      'library_name': 'libcairo2',
+      'library_name': 'libp11-kit0',
       'dependencies=': [],
-      'custom_configure_flags': '--disable-gtk-doc',
       'includes': ['standard_instrumented_library_target.gypi'],
     },
     {
@@ -124,30 +144,24 @@
       'includes': ['standard_instrumented_library_target.gypi'],
     },
     {
-      'library_name': 'libxau6',
+      'library_name': 'libpixman-1-0',
       'dependencies=': [],
       'includes': ['standard_instrumented_library_target.gypi'],
     },
     {
-      'library_name': 'libglib2.0-0',
+      'library_name': 'libpng12-0',
       'dependencies=': [],
-      'custom_configure_flags': [
-        '--disable-gtk-doc',
-        '--disable-gtk-doc-html',
-        '--disable-gtk-doc-pdf',
-      ],
       'includes': ['standard_instrumented_library_target.gypi'],
     },
     {
-      'library_name': 'libxdmcp6',
+      'library_name': 'libx11-6',
       'dependencies=': [],
-      'custom_configure_flags': '--disable-docs',
+      'custom_configure_flags': '--disable-specs',
       'includes': ['standard_instrumented_library_target.gypi'],
     },
     {
-      'library_name': 'libx11-6',
+      'library_name': 'libxau6',
       'dependencies=': [],
-      'custom_configure_flags': '--disable-specs',
       'includes': ['standard_instrumented_library_target.gypi'],
     },
     {
@@ -157,12 +171,38 @@
       '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',
       'dependencies=': [],
       'custom_configure_flags': '--disable-specs',
       'includes': ['standard_instrumented_library_target.gypi'],
     },
     {
+      'library_name': 'libxfixes3',
+      'dependencies=': [],
+      'includes': ['standard_instrumented_library_target.gypi'],
+    },
+    {
       'library_name': 'libxi6',
       'dependencies=': [],
       'custom_configure_flags': [
@@ -172,6 +212,11 @@
       'includes': ['standard_instrumented_library_target.gypi'],
     },
     {
+      'library_name': 'libxinerama1',
+      'dependencies=': [],
+      'includes': ['standard_instrumented_library_target.gypi'],
+    },
+    {
       'library_name': 'libxrandr2',
       'dependencies=': [],
       'includes': ['standard_instrumented_library_target.gypi'],
@@ -182,10 +227,22 @@
       'includes': ['standard_instrumented_library_target.gypi'],
     },
     {
+      'library_name': 'libxss1',
+      'dependencies=': [],
+      'includes': ['standard_instrumented_library_target.gypi'],
+    },
+    {
       'library_name': 'libxtst6',
       'dependencies=': [],
       'custom_configure_flags': '--disable-specs',
       'includes': ['standard_instrumented_library_target.gypi'],
     },
+    {
+      'library_name': 'zlib1g',
+      'dependencies=': [
+        '<@(_first_order_libraries)', 
+      ],
+      'includes': ['standard_instrumented_library_target.gypi'],
+    },
   ],
 }