Instrumented libraries: the much-needed build script rewrite.

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,
   },
 
+  'libdir': 'lib',
   'ubuntu_release': '<!(lsb_release -cs)',
 
   'conditions': [
     ['asan==1', {
       'sanitizer_type': 'asan',
     }],
     ['msan==1', {
       'sanitizer_type': 'msan',
     }],
     ['tsan==1', {
@@ skipping 146 matching lines @@
             '<(_sanitizer_type)-brltty',
             '<(_sanitizer_type)-libva1',
           ],
         }]
       ],
       'direct_dependent_settings': {
         'target_conditions': [
           ['_toolset=="target"', {
             'ldflags': [
               # Add RPATH to result binary to make it linking instrumented libraries ($ORIGIN means relative RPATH)
-              '-Wl,-R,\$$ORIGIN/instrumented_libraries/<(_sanitizer_type)/lib/',
+              '-Wl,-R,\$$ORIGIN/instrumented_libraries/<(_sanitizer_type)/<(_libdir)/',
               '-Wl,-z,origin',
             ],
           }],
         ],
       },
     },
     {
       'package_name': 'freetype',
       'dependencies=': [],
       'extra_configure_flags': ['--disable-static'],
@@ skipping 593 matching lines @@
       'extra_configure_flags': [
           '--disable-static',
           # See above.
           '--disable-introspection',
       ],
       'run_before_build': 'scripts/autoreconf.sh',
       'includes': ['standard_instrumented_package_target.gypi'],
     },
   ],
 }