Skip to content

Commit c6ca30d

Browse files
committed
Make harfbuzz not use mutexes, since we only layout on
UI task runner. Change-Id: I24cadbf4000e0fa2f69361dea907416e39c5cf0c Reviewed-on: https://fuchsia-review.googlesource.com/c/third_party/harfbuzz/+/415794 Reviewed-by: Chinmay Garde <chinmaygarde@google.com>
1 parent e2327f4 commit c6ca30d

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

BUILD.gn

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -260,34 +260,34 @@ source_set("harfbuzz_sources") {
260260
defines += [ "HAVE_CORETEXT" ]
261261
}
262262

263+
if (is_linux || is_android || is_fuchsia) {
264+
defines += [ "HAVE_PTHREAD" ]
265+
}
266+
263267
configs += [ ":harfbuzz_warnings" ]
264268

265269
# Without this modification, almost everything ends up hidden in the shared library, making it
266270
# useless for linking.
267271
if (current_toolchain == shlib_toolchain) {
268272
# Avoid failure when subtracting if not already present.
269-
configs += ["//build/config:symbol_visibility_hidden"]
270-
configs -= ["//build/config:symbol_visibility_hidden"]
273+
configs += [ "//build/config:symbol_visibility_hidden" ]
274+
configs -= [ "//build/config:symbol_visibility_hidden" ]
271275
}
272276

273277
public_configs = [ ":harfbuzz_config" ]
274278

275279
deps = [
280+
"//third_party/freetype2",
276281
"//third_party/icu:icuuc",
277-
"//third_party/freetype2"
278282
]
279283
}
280284

281285
source_set("harfbuzz") {
282286
output_name = "harfbuzz"
283-
public_deps = [
284-
":harfbuzz_sources"
285-
]
287+
public_deps = [ ":harfbuzz_sources" ]
286288
}
287289

288290
shared_library("harfbuzz_shared") {
289291
output_name = "harfbuzz"
290-
public_deps = [
291-
":harfbuzz_sources",
292-
]
292+
public_deps = [ ":harfbuzz_sources" ]
293293
}

0 commit comments

Comments
 (0)