Instrumented libraries: get rid of dependencies between instrumented packages.

They have no effect on the build process anyway. All they do is slow down the
build by making it less parallelizable.

BUG=313751
TBR=glider@chromium.org
NOTRY=true

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@287058 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 8 insertions, 22 deletions

diff --git a/third_party/instrumented_libraries/download_build_install.py b/third_party/instrumented_libraries/download_build_install.py
index 3a2062d..6b3a926 100755
--- a/third_party/instrumented_libraries/download_build_install.py
+++ b/third_party/instrumented_libraries/download_build_install.py
@@ -126,7 +126,7 @@ def nss_make_and_copy(parsed_arguments, environment, install_prefix):
   # added during linking on Linux.
   make_args.append('ZDEFS_FLAG="-Wl,-z,nodefs %s"' % environment['LDFLAGS'])
   make_args.append('NSPR_INCLUDE_DIR=/usr/include/nspr')
-  make_args.append('NSPR_LIB_DIR=%s/lib' % install_prefix)
+  make_args.append('NSPR_LIB_DIR=/usr/lib')
   make_args.append('NSS_ENABLE_ECC=1')
   with ScopedChangeDirectory('nss') as cd_nss:
     # -j is not supported
diff --git a/third_party/instrumented_libraries/instrumented_libraries.gyp b/third_party/instrumented_libraries/instrumented_libraries.gyp
index da0b05b..f3ac38e 100644
--- a/third_party/instrumented_libraries/instrumented_libraries.gyp
+++ b/third_party/instrumented_libraries/instrumented_libraries.gyp
@@ -188,16 +188,12 @@
     },
     {
       'package_name': 'libdbus-1-3',
-      'dependencies=': [
-        '<(_sanitizer_type)-libglib2.0-0',
-      ],
+      'dependencies=': [],
       'includes': ['standard_instrumented_package_target.gypi'],
     },
     {
       'package_name': 'libdbus-glib-1-2',
-      'dependencies=': [
-        '<(_sanitizer_type)-libglib2.0-0',
-      ],
+      'dependencies=': [],
       # Use system dbus-binding-tool. The just-built one is instrumented but
       # doesn't have the correct RPATH, and will crash.
       'extra_configure_flags': ['--with-dbus-binding-tool=dbus-binding-tool'],
@@ -215,9 +211,7 @@
     },
     {
       'package_name': 'libfontconfig1',
-      'dependencies=': [
-        '<(_sanitizer_type)-freetype',
-      ],
+      'dependencies=': [],
       'extra_configure_flags': [
         '--disable-docs',
         '--sysconfdir=/etc/',
@@ -284,9 +278,7 @@
     },
     {
       'package_name': 'libpixman-1-0',
-      'dependencies=': [
-        '<(_sanitizer_type)-libglib2.0-0',
-      ],
+      'dependencies=': [],
       'includes': ['standard_instrumented_package_target.gypi'],
     },
     {
@@ -387,18 +379,14 @@
     },
     {
       'package_name': 'nss',
-      'dependencies=': [
-        '<(_sanitizer_type)-libnspr4',
-      ],
+      'dependencies=': [],
       'patch': 'patches/nss.diff',
       'build_method': 'custom_nss',
       'includes': ['standard_instrumented_package_target.gypi'],
     },
     {
       'package_name': 'pulseaudio',
-      'dependencies=': [
-        '<(_sanitizer_type)-libdbus-1-3',
-      ],
+      'dependencies=': [],
       'patch': 'patches/pulseaudio.diff',
       'run_before_build': 'scripts/pulseaudio.sh',
       'jobs': 1,
@@ -444,9 +432,7 @@
     },
     {
       'package_name': 'pango1.0',
-      'dependencies=': [
-        '<(_sanitizer_type)-libglib2.0-0',
-      ],
+      'dependencies=': [],
       'extra_configure_flags': [
         # Avoid https://bugs.gentoo.org/show_bug.cgi?id=425620
         '--enable-introspection=no',