Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(17)

Unified Diff: third_party/harfbuzz-ng/harfbuzz.gyp

Issue 509323004: ozone: Whitelist some libs for the embedded build (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | tools/check_ecs_deps/check_ecs_deps.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/harfbuzz-ng/harfbuzz.gyp
diff --git a/third_party/harfbuzz-ng/harfbuzz.gyp b/third_party/harfbuzz-ng/harfbuzz.gyp
index 6cfed6559229eb5122de38cb19b1d94a7c60f4b6..3e6fed4381b1994e67e4b7faaca0da3d429022b2 100644
--- a/third_party/harfbuzz-ng/harfbuzz.gyp
+++ b/third_party/harfbuzz-ng/harfbuzz.gyp
@@ -20,7 +20,7 @@
'pkg-config': '<(pkg-config)',
'conditions': [
- ['OS=="linux" and (buildtype!="Official" or chromeos==1)', {
+ ['OS=="linux" and (buildtype!="Official" or chromeos==1) and embedded==0', {
# Since version 1.31.0, pangoft2 which we depend on pulls in harfbuzz
# anyways. However, we want to have control of the version of harfbuzz
# we use, so don't use system harfbuzz for official builds, unless we
« no previous file with comments | « no previous file | tools/check_ecs_deps/check_ecs_deps.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698