Instrumented libraries: improve handling of custom patches.

third_party/instrumented_libraries/instrumented_libraries.gyp

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'verbose_libraries_build%': 0,
     'instrumented_libraries_jobs%': 1,
   },
 
@@ skipping 28 matching lines @@
       '-U_FORITFY_SOURCE'
     ],
     'package_ldflags': [
       '-Wl,-z,origin',
       # We set RPATH=XORIGIN when building the package and replace it with
       # $ORIGIN later. The reason is that this flag goes through configure/make
       # differently for different packages. Because of this, we can't escape the
       # $ character in a way that would work for every package.
       '-Wl,-R,XORIGIN/.'
     ],
+    'patch': '',
     'run_before_build': '',
 
     'conditions': [
       ['asan==1', {
         'sanitizer_blacklist': '',
         'package_cflags': ['-fsanitize=address'],
         'package_ldflags': ['-fsanitize=address'],
       }],
       ['msan==1', {
         'sanitizer_blacklist': '<(msan_blacklist)',
@@ skipping 110 matching lines @@
               '-Wl,-R,\$$ORIGIN/instrumented_libraries/<(_sanitizer_type)/lib/:\$$ORIGIN/instrumented_libraries/<(_sanitizer_type)/usr/lib/x86_64-linux-gnu/',
               '-Wl,-z,origin',
             ],
           }],
         ],
       },
     },
     {
       'package_name': 'freetype',
       'dependencies=': [],
-      'run_before_build': 'freetype.sh',
+      'run_before_build': 'scripts/freetype.sh',
       'includes': ['standard_instrumented_package_target.gypi'],
     },
     {
       'package_name': 'libcairo2',
       'dependencies=': [],
       'extra_configure_flags': ['--disable-gtk-doc'],
       'includes': ['standard_instrumented_package_target.gypi'],
     },
     {
       'package_name': 'libdbus-1-3',
@@ skipping 26 matching lines @@
       'package_name': 'libfontconfig1',
       'dependencies=': [
         '<(_sanitizer_type)-freetype',
       ],
       'extra_configure_flags': [
         '--disable-docs',
         '--sysconfdir=/etc/',
         # From debian/rules.
         '--with-add-fonts=/usr/X11R6/lib/X11/fonts,/usr/local/share/fonts',
       ],
-      'run_before_build': 'libfontconfig.sh',
+      'patch': 'patches/libfontconfig.diff',
       'includes': ['standard_instrumented_package_target.gypi'],
     },
     {
       'package_name': 'libgcrypt11',
       'dependencies=': [],
       'package_ldflags': ['-Wl,-z,muldefs'],
       'includes': ['standard_instrumented_package_target.gypi'],
     },
     {
       'package_name': 'libglib2.0-0',
@@ skipping 11 matching lines @@
       'includes': ['standard_instrumented_package_target.gypi'],
     },
     {
       'package_name': 'libnspr4',
       'dependencies=': [],
       'extra_configure_flags': [
         '--enable-64bit',
         # TSan reports data races on debug variables.
         '--disable-debug',
       ],
-      'run_before_build': 'libnspr4.sh',
+      'run_before_build': 'scripts/libnspr4.sh',
       'includes': ['standard_instrumented_package_target.gypi'],
     },
     {
       'package_name': 'libp11-kit0',
       'dependencies=': [],
       'includes': ['standard_instrumented_package_target.gypi'],
     },
     {
       'package_name': 'libpcre3',
       'dependencies=': [],
@@ skipping 95 matching lines @@
     },
     {
       'package_name': 'libxtst6',
       'dependencies=': [],
       'extra_configure_flags': ['--disable-specs'],
       'includes': ['standard_instrumented_package_target.gypi'],
     },
     {
       'package_name': 'zlib1g',
       'dependencies=': [],
-      'run_before_build': 'zlib1g.sh',
+      'patch': 'patches/zlib1g.diff',
       'includes': ['standard_instrumented_package_target.gypi'],
     },
     {
       'package_name': 'nss',
       'dependencies=': [
         '<(_sanitizer_type)-libnspr4',
       ],
-      'run_before_build': 'nss.sh',
+      'patch': 'patches/nss.diff',
       'build_method': 'custom_nss',
       'includes': ['standard_instrumented_package_target.gypi'],
     },
     {
       'package_name': 'pulseaudio',
       'dependencies=': [
         '<(_sanitizer_type)-libdbus-1-3',
       ],
-      'run_before_build': 'pulseaudio.sh',
+      'patch': 'patches/pulseaudio.diff',
+      'run_before_build': 'scripts/pulseaudio.sh',
       'jobs': 1,
       'includes': ['standard_instrumented_package_target.gypi'],
     },
     {
       'package_name': 'libasound2',
       'dependencies=': [],
-      'run_before_build': 'libasound2.sh',
+      'run_before_build': 'scripts/libasound2.sh',
       'includes': ['standard_instrumented_package_target.gypi'],
     },
     {
       'package_name': 'libcups2',
       'dependencies=': [],
-      'run_before_build': 'libcups2.sh',
+      'patch': 'patches/libcups2.diff',
       'jobs': 1,
       'extra_configure_flags': [
         # All from debian/rules.
         '--localedir=/usr/share/cups/locale',
         '--enable-slp',
         '--enable-libpaper',
         '--enable-ssl',
         '--enable-gnutls',
         '--disable-openssl',
         '--enable-threads',
@@ skipping 65 matching lines @@
       'package_cflags': ['-Wno-return-type'],
       'extra_configure_flags': [
           # From debian/rules.
           '--prefix=/usr',
           '--sysconfdir=/etc',
           '--enable-test-print-backend',
           '--enable-introspection=no',
           '--with-xinput=yes',
       ],
       'dependencies=': [],
-      'run_before_build': 'libgtk2.0-0.sh',
+      'patch': 'patches/libgtk2.0-0.diff',
+      'run_before_build': 'scripts/libgtk2.0-0.sh',
       'includes': ['standard_instrumented_package_target.gypi'],
     },
     {
       'package_name': 'libgdk-pixbuf2.0-0',
       'extra_configure_flags': [
           # From debian/rules.
           '--with-libjasper',
           '--with-x11',
           # Make the build less problematic.
           '--disable-introspection',
       ],
       'dependencies=': [],
-      'run_before_build': 'libgdk-pixbuf2.0-0.sh',
+      'patch': 'patches/libgdk-pixbuf2.0-0.diff',
+      'run_before_build': 'scripts/libgdk-pixbuf2.0-0.sh',
       'includes': ['standard_instrumented_package_target.gypi'],
     },
     {
       'package_name': 'libpci3',
       'dependencies=': [],
       'build_method': 'custom_libpci3',
       'jobs': 1,
       'includes': ['standard_instrumented_package_target.gypi'],
     },
     {
@@ skipping 32 matching lines @@
       'includes': ['standard_instrumented_package_target.gypi'],
     },
     {
       'package_name': 'libappindicator1',
       'extra_configure_flags': [
           # See above.
           '--disable-introspection',
       ],
       'dependencies=': [],
       'build_method': 'custom_libappindicator1',
+      'jobs': 1,
       'includes': ['standard_instrumented_package_target.gypi'],
     },
     {
       'package_name': 'libdbusmenu',
       'extra_configure_flags': [
           # From debian/rules.
           '--disable-scrollkeeper',
           '--with-gtk=2',
           # See above.
           '--disable-introspection',
@@ skipping 20 matching lines @@
       'package_name': 'dee',
       'extra_configure_flags': [
           # See above.
           '--disable-introspection',
       ],
       'dependencies=': [],
       'includes': ['standard_instrumented_package_target.gypi'],
     },
   ],
 }