Instrumented libraries: use statically linked modules for pango.

This allows us to finally ditch the PREFIX build method.

BUG=313751
TBR=glider@chromium.org
NOTRY=true
TEST=MSan Chrome

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

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

2 files changed, 5 insertions, 20 deletions

diff --git a/third_party/instrumented_libraries/download_build_install.py b/third_party/instrumented_libraries/download_build_install.py
index d07c7ee..3a69578 100755
--- a/third_party/instrumented_libraries/download_build_install.py
+++ b/third_party/instrumented_libraries/download_build_install.py
@@ -107,17 +107,6 @@ def destdir_configure_make_install(parsed_arguments, environment,
                      parsed_arguments.verbose, environment)
 
 
-def prefix_configure_make_install(parsed_arguments, environment,
-                                  install_prefix):
-  configure_command = './configure %s --prefix=%s' % (
-      parsed_arguments.extra_configure_flags, install_prefix)
-  shell_call(configure_command, parsed_arguments.verbose, environment)
-  shell_call('make -j%s' % parsed_arguments.jobs,
-             parsed_arguments.verbose, environment)
-  shell_call('make -j%s install' % parsed_arguments.jobs,
-             parsed_arguments.verbose, environment)
-
-
 def nss_make_and_copy(parsed_arguments, environment, install_prefix):
   # NSS uses a build system that's different from configure/make/install. All
   # flags must be passed as arguments to make.
@@ -210,18 +199,10 @@ def build_and_install(parsed_arguments, environment, install_prefix):
   if parsed_arguments.build_method == 'destdir':
     destdir_configure_make_install(
         parsed_arguments, environment, install_prefix)
-  elif parsed_arguments.build_method == 'prefix':
-    prefix_configure_make_install(parsed_arguments, environment, install_prefix)
   elif parsed_arguments.build_method == 'custom_nss':
     nss_make_and_copy(parsed_arguments, environment, install_prefix)
   elif parsed_arguments.build_method == 'custom_libcap':
     libcap2_make_install(parsed_arguments, environment, install_prefix)
-  elif parsed_arguments.build_method == 'custom_pango':
-    parsed_arguments.extra_configure_flags += \
-      ' --x-libraries=%s/lib' % install_prefix
-    parsed_arguments.extra_configure_flags += \
-      ' --x-includes=%s/include' % install_prefix
-    prefix_configure_make_install(parsed_arguments, environment, install_prefix)
   elif parsed_arguments.build_method == 'custom_libpci3':
     libpci3_make_install(parsed_arguments, environment, install_prefix)
   elif parsed_arguments.build_method == 'custom_libappindicator1':
diff --git a/third_party/instrumented_libraries/instrumented_libraries.gyp b/third_party/instrumented_libraries/instrumented_libraries.gyp
index 7ab04c1..5c8309f 100644
--- a/third_party/instrumented_libraries/instrumented_libraries.gyp
+++ b/third_party/instrumented_libraries/instrumented_libraries.gyp
@@ -440,8 +440,12 @@
       'extra_configure_flags': [
         # Avoid https://bugs.gentoo.org/show_bug.cgi?id=425620
         '--enable-introspection=no',
+        # Pango is normally used with dynamically loaded modules. However,
+        # ensuring pango is able to find instrumented versions of those modules
+        # is a huge pain in the neck. Let's link them statically instead, and
+        # hope for the best.
+        '--with-included-modules=yes'
       ],
-      'build_method': 'custom_pango',
       'includes': ['standard_instrumented_package_target.gypi'],
     },
     {