diff options
| author | earthdok <earthdok@chromium.org> | 2014-11-11 11:06:06 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-11 19:06:21 +0000 |
| commit | 2c4cad9beb556d85aec8091cc9026b9a1fecf04e (patch) | |
| tree | bbee434f58afec04e07c090158439a03e2cef1a5 /third_party/instrumented_libraries/instrumented_libraries.gyp | |
| parent | baa4589daf1c7fce3698f5bee819b8268aae0fb3 (diff) | |
| download | chromium_src-2c4cad9beb556d85aec8091cc9026b9a1fecf04e.zip chromium_src-2c4cad9beb556d85aec8091cc9026b9a1fecf04e.tar.gz chromium_src-2c4cad9beb556d85aec8091cc9026b9a1fecf04e.tar.bz2 | |
Instrumented libraries: add harfbuzz.
On Trusty we use the system-installed HarfBuzz.
BUG=414189
TBR=glider@chromium.org
NOTRY=true
Review URL: https://codereview.chromium.org/695523003
Cr-Commit-Position: refs/heads/master@{#303683}
Diffstat (limited to 'third_party/instrumented_libraries/instrumented_libraries.gyp')
| -rw-r--r-- | third_party/instrumented_libraries/instrumented_libraries.gyp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/third_party/instrumented_libraries/instrumented_libraries.gyp b/third_party/instrumented_libraries/instrumented_libraries.gyp index fc07a3f..9a3c944 100644 --- a/third_party/instrumented_libraries/instrumented_libraries.gyp +++ b/third_party/instrumented_libraries/instrumented_libraries.gyp @@ -143,6 +143,7 @@ }, { 'dependencies': [ '<(_sanitizer_type)-libtasn1-6', + '<(_sanitizer_type)-harfbuzz', ], }], ['msan==1', { @@ -667,5 +668,18 @@ 'run_before_build': 'scripts/autogen.sh', 'includes': ['standard_instrumented_package_target.gypi'], }, + { + 'package_name': 'harfbuzz', + 'package_cflags': ['-Wno-c++11-narrowing'], + 'extra_configure_flags': [ + # From debian/rules. + '--with-graphite2=yes', + '--with-gobject', + # See above. + '--disable-introspection', + ], + 'dependencies=': [], + 'includes': ['standard_instrumented_package_target.gypi'], + }, ], } |