Instrumented libraries: refactor build scripts.

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.
 
 {
   # Default value for all libraries.
-  'custom_configure_flags': '',
-  'custom_c_compiler_flags': '',
-  'custom_cxx_compiler_flags': '',
-  'custom_linker_flags': '',
+  'extra_configure_flags': '',
+  'extra_cflags': '',
+  'extra_cxxflags': '',
+  'extra_ldflags': '',
   'run_before_build': '',
   'build_method': 'destdir',
 
   'variables': {
     'verbose_libraries_build%': 0,
     'instrumented_libraries_jobs%': 1,
   },
 
   'jobs': '<(instrumented_libraries_jobs)',
 
   'conditions': [
     ['asan==1', {
       'sanitizer_type': 'asan',
       'sanitizer_blacklist': '',
     }],
     ['msan==1', {
       'sanitizer_type': 'msan',
       'sanitizer_blacklist': '<(msan_blacklist)',
     }],
     ['tsan==1', {
       'sanitizer_type': 'tsan',
       'sanitizer_blacklist': '<(tsan_blacklist)',
     }],
-    ['verbose_libraries_build==1', {
-      'verbose_libraries_build_flag': '--verbose',
-    }, {
-      'verbose_libraries_build_flag': '',
-    }],
     ['use_goma==1', {
       'cc': '<(gomadir)/gomacc <!(cd <(DEPTH) && pwd -P)/<(make_clang_dir)/bin/clang',
       'cxx': '<(gomadir)/gomacc <!(cd <(DEPTH) && pwd -P)/<(make_clang_dir)/bin/clang++',
     }, {
       'cc': '<!(cd <(DEPTH) && pwd -P)/<(make_clang_dir)/bin/clang',
       'cxx': '<!(cd <(DEPTH) && pwd -P)/<(make_clang_dir)/bin/clang++',
     }],
   ],
   'targets': [
     {
@@ skipping 88 matching lines @@
     },
     {
       'library_name': 'freetype',
       'dependencies=': [],
       'run_before_build': 'freetype.sh',
       'includes': ['standard_instrumented_library_target.gypi'],
     },
     {
       'library_name': 'libcairo2',
       'dependencies=': [],
-      'custom_configure_flags': '--disable-gtk-doc',
+      'extra_configure_flags': '--disable-gtk-doc',
       'includes': ['standard_instrumented_library_target.gypi'],
     },
     {
       'library_name': 'libdbus-1-3',
       'dependencies=': [
         '<(_sanitizer_type)-libglib2.0-0',
       ],
       'includes': ['standard_instrumented_library_target.gypi'],
     },
     {
       'library_name': 'libdbus-glib-1-2',
       'dependencies=': [
         '<(_sanitizer_type)-libglib2.0-0',
       ],
       # Use system dbus-binding-tool. The just-built one is instrumented but
       # doesn't have the correct RPATH, and will crash.
-      'custom_configure_flags': '--with-dbus-binding-tool=dbus-binding-tool',
+      'extra_configure_flags': '--with-dbus-binding-tool=dbus-binding-tool',
       'includes': ['standard_instrumented_library_target.gypi'],
     },
     {
       'library_name': 'libexpat1',
       'dependencies=': [],
       'includes': ['standard_instrumented_library_target.gypi'],
     },
     {
       'library_name': 'libffi6',
       'dependencies=': [],
       'includes': ['standard_instrumented_library_target.gypi'],
     },
     {
       'library_name': 'libfontconfig1',
       'dependencies=': [
         '<(_sanitizer_type)-freetype',
       ],
-      'custom_configure_flags': [
+      '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',
       'includes': ['standard_instrumented_library_target.gypi'],
     },
     {
       'library_name': 'libgcrypt11',
       'dependencies=': [],
-      'custom_linker_flags': '-Wl,-z,muldefs',
+      'extra_ldflags': '-Wl,-z,muldefs',
       'includes': ['standard_instrumented_library_target.gypi'],
     },
     {
       'library_name': 'libglib2.0-0',
       'dependencies=': [],
-      'custom_configure_flags': [
+      'extra_configure_flags': [
         '--disable-gtk-doc',
         '--disable-gtk-doc-html',
         '--disable-gtk-doc-pdf',
       ],
       'includes': ['standard_instrumented_library_target.gypi'],
     },
     {
       'library_name': 'libgpg-error0',
       'dependencies=': [],
       'includes': ['standard_instrumented_library_target.gypi'],
     },
     {
       'library_name': 'libnspr4',
       'dependencies=': [],
-      'custom_configure_flags': '--enable-64bit',
+      'extra_configure_flags': '--enable-64bit',
       'run_before_build': 'libnspr4.sh',
       'includes': ['standard_instrumented_library_target.gypi'],
     },
     {
       'library_name': 'libp11-kit0',
       'dependencies=': [],
       'includes': ['standard_instrumented_library_target.gypi'],
     },
     {
       'library_name': 'libpcre3',
       'dependencies=': [],
-      'custom_configure_flags': [
+      'extra_configure_flags': [
         '--enable-utf8',
         '--enable-unicode-properties',
       ],
       'includes': ['standard_instrumented_library_target.gypi'],
     },
     {
       'library_name': 'libpixman-1-0',
       'dependencies=': [
         '<(_sanitizer_type)-libglib2.0-0',
       ],
       'includes': ['standard_instrumented_library_target.gypi'],
     },
     {
       'library_name': 'libpng12-0',
       'dependencies=': [],
       'includes': ['standard_instrumented_library_target.gypi'],
     },
     {
       'library_name': 'libx11-6',
       'dependencies=': [],
-      'custom_configure_flags': '--disable-specs',
+      'extra_configure_flags': '--disable-specs',
       'includes': ['standard_instrumented_library_target.gypi'],
     },
     {
       'library_name': 'libxau6',
       'dependencies=': [],
       'includes': ['standard_instrumented_library_target.gypi'],
     },
     {
       'library_name': 'libxcb1',
       'dependencies=': [],
-      'custom_configure_flags': '--disable-build-docs',
+      'extra_configure_flags': '--disable-build-docs',
       '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',
+      'extra_configure_flags': '--disable-docs',
       'includes': ['standard_instrumented_library_target.gypi'],
     },
     {
       'library_name': 'libxext6',
       'dependencies=': [],
-      'custom_configure_flags': '--disable-specs',
+      'extra_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': [
+      'extra_configure_flags': [
         '--disable-specs',
         '--disable-docs',
       ],
       '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'],
     },
     {
       'library_name': 'libxrender1',
       'dependencies=': [],
       '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',
+      'extra_configure_flags': '--disable-specs',
       'includes': ['standard_instrumented_library_target.gypi'],
     },
     {
       'library_name': 'zlib1g',
       'dependencies=': [],
       'includes': ['standard_instrumented_library_target.gypi'],
     },
     {
       'library_name': 'nss',
       'dependencies=': [
@@ skipping 16 matching lines @@
       'library_name': 'libasound2',
       'dependencies=': [],
       'run_before_build': 'libasound2.sh',
       'includes': ['standard_instrumented_library_target.gypi'],
     },
     {
       'library_name': 'libcups2',
       'dependencies=': [],
       'run_before_build': 'libcups2.sh',
       'jobs': 1,
-      'custom_configure_flags': [
+      'extra_configure_flags': [
         # All from debian/rules.
         '--localedir=/usr/share/cups/locale',
         '--enable-slp',
         '--enable-libpaper',
         '--enable-ssl',
         '--enable-gnutls',
         '--disable-openssl',
         '--enable-threads',
         '--enable-static',
         '--enable-debug',
@@ skipping 11 matching lines @@
         '--with-remote_protocols="CUPS dnssd"',
         '--enable-libusb',
       ],
       'includes': ['standard_instrumented_library_target.gypi'],
     },
     {
       'library_name': 'pango1.0',
       'dependencies=': [
         '<(_sanitizer_type)-libglib2.0-0',
       ],
-      'custom_configure_flags': [
+      'extra_configure_flags': [
         # Avoid https://bugs.gentoo.org/show_bug.cgi?id=425620
         '--enable-introspection=no',
       ],
       'build_method': 'custom_pango',
       'includes': ['standard_instrumented_library_target.gypi'],
     },
     {
       'library_name': 'libcap2',
       'dependencies=': [],
       'build_method': 'custom_libcap',
       'includes': ['standard_instrumented_library_target.gypi'],
     },
     {
       'library_name': 'libudev0',
       'dependencies=': [],
-      'custom_configure_flags': [
+      'extra_configure_flags': [
           # Without this flag there's a linking step that doesn't honor LDFLAGS
           # and fails.
           # TODO(earthdok): find a better fix.
           '--disable-gudev'
       ],
       'includes': ['standard_instrumented_library_target.gypi'],
     },
     {
       'library_name': 'libtasn1-3',
       'dependencies=': [],
       'includes': ['standard_instrumented_library_target.gypi'],
     },
     {
       'library_name': 'libgnome-keyring0',
-      'custom_configure_flags': [
+      'extra_configure_flags': [
           # Build static libs (from debian/rules).
           '--enable-static',
           '--enable-tests=no',
       ],
-      'custom_linker_flags': '-Wl,--as-needed',
+      'extra_ldflags': '-Wl,--as-needed',
       'dependencies=': [],
       'includes': ['standard_instrumented_library_target.gypi'],
     },
     {
       'library_name': 'libgtk2.0-0',
-      'custom_c_compiler_flags': '-Wno-return-type',
-      'custom_configure_flags': [
+      'extra_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',
       'includes': ['standard_instrumented_library_target.gypi'],
     },
     {
       'library_name': 'libgdk-pixbuf2.0-0',
-      'custom_configure_flags': [
+      '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',
       'includes': ['standard_instrumented_library_target.gypi'],
     },
     {
       'library_name': 'libpci3',
       'dependencies=': [],
       'build_method': 'custom_libpci3',
       'jobs': 1,
       'includes': ['standard_instrumented_library_target.gypi'],
     },
     {
       'library_name': 'libdbusmenu-glib4',
-      'custom_configure_flags': [
+      'extra_configure_flags': [
           # From debian/rules.
           '--disable-scrollkeeper',
           '--enable-gtk-doc',
           # --enable-introspection introduces a build step that attempts to run
           # a just-built binary and crashes. Vala requires introspection.
           # TODO(earthdok): find a better fix.
           '--disable-introspection',
           '--disable-vala',
       ],
       'dependencies=': [],
       'includes': ['standard_instrumented_library_target.gypi'],
     },
   ],
 }