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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: gyp/freetype.gyp

Issue 1036283002: Remove all code related to NaCl (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Rebase Created 5 years, 9 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 | « gyp/debugger.gyp ('k') | gyp/gpu.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/freetype.gyp
diff --git a/gyp/freetype.gyp b/gyp/freetype.gyp
index 7187d9af148edf8fb581f168225442cf6c7b0e4a..85018a49acf1bed0b32a33700afad17c922ea72c 100644
--- a/gyp/freetype.gyp
+++ b/gyp/freetype.gyp
@@ -18,11 +18,11 @@
'freetype_static'
],
'conditions': [
- [ 'skia_os in ["android", "nacl"]',
+ [ 'skia_os == "android"',
{
'direct_dependent_settings': {
'defines': [
- # Both Android and NaCl provide at least FreeType 2.4.0
+ # Android provides at least FreeType 2.4.0
'SK_FONTHOST_FREETYPE_RUNTIME_VERSION=0x020400',
'SK_CAN_USE_DLOPEN=0',
],
« no previous file with comments | « gyp/debugger.gyp ('k') | gyp/gpu.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698