diff options
| author | Gordana.Cmiljanovic <Gordana.Cmiljanovic@imgtec.com> | 2015-07-18 14:27:28 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-18 21:28:08 +0000 |
| commit | 43d281f0743db455512956be8a4aa70a6ea720ef (patch) | |
| tree | 6accc66dc9cb86515ec4c5b35ebd23720e4e7d89 /third_party/harfbuzz-ng | |
| parent | 6d3db12b8b7d097a1ce6ea2c138698436c17aa4b (diff) | |
| download | chromium_src-43d281f0743db455512956be8a4aa70a6ea720ef.zip chromium_src-43d281f0743db455512956be8a4aa70a6ea720ef.tar.gz chromium_src-43d281f0743db455512956be8a4aa70a6ea720ef.tar.bz2 | |
Let pango use system harfbuzz on MIPS
There is a crash in harfbuzz when starting Chrome on MIPS
if pango is using bundled harfbuzz
(since https://codereview.chromium.org/1222653002)
BUG=510582
Review URL: https://codereview.chromium.org/1225093008
Cr-Commit-Position: refs/heads/master@{#339399}
Diffstat (limited to 'third_party/harfbuzz-ng')
| -rw-r--r-- | third_party/harfbuzz-ng/BUILD.gn | 5 | ||||
| -rw-r--r-- | third_party/harfbuzz-ng/harfbuzz.gyp | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/third_party/harfbuzz-ng/BUILD.gn b/third_party/harfbuzz-ng/BUILD.gn index 6e735ab..ac49507 100644 --- a/third_party/harfbuzz-ng/BUILD.gn +++ b/third_party/harfbuzz-ng/BUILD.gn @@ -170,7 +170,7 @@ if (use_system_harfbuzz) { # pango uses mixed versions of harfbuzz and leads to crash. # See crbug.com/462689. if (is_linux && use_pango && !is_chromeos && !is_official_build && - current_cpu != "arm") { + current_cpu != "arm" && current_cpu != "mipsel") { configs -= [ "//build/config/gcc:symbol_visibility_hidden" ] configs += [ "//build/config/linux:freetype2", @@ -187,7 +187,8 @@ if (use_system_harfbuzz) { # See also chrome/browser/ui/libgtk2ui/BUILD.gn which pulls this. config("pangoft2_link_hack") { if (is_linux && use_pango && !is_chromeos && !is_official_build && - current_cpu != "arm" && !is_component_build) { + current_cpu != "arm" && current_cpu != "mipsel" && + !is_component_build) { # These symbols are referenced from libpangoft2, which will be # dynamically linked later. ldflags = diff --git a/third_party/harfbuzz-ng/harfbuzz.gyp b/third_party/harfbuzz-ng/harfbuzz.gyp index b2f1d91..61414c03 100644 --- a/third_party/harfbuzz-ng/harfbuzz.gyp +++ b/third_party/harfbuzz-ng/harfbuzz.gyp @@ -155,7 +155,7 @@ # in the tree, all symbols pango needs must be included, or # pango uses mixed versions of harfbuzz and leads to crash. # See crbug.com/462689. - ['use_pango==1 and OS=="linux" and chromeos==0 and buildtype!="Official" and target_arch!="arm"', { + ['use_pango==1 and OS=="linux" and chromeos==0 and buildtype!="Official" and target_arch!="arm" and target_arch!="mipsel"', { 'cflags!': ['-fvisibility=hidden'], 'sources': [ 'src/hb-ft.cc', |