diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2013-03-05 12:11:37 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2013-03-05 12:11:37 +0000 |
| commit | 005c002e2cfc6b2863cc423ac60f859eb01950cd (patch) | |
| tree | 48742a5b90522b41a2e62bcc85b1db2f062e9173 /ft2.target.linux-x86.mk | |
| parent | f9743101858cadc5e235bfdd523f9d46fe96784a (diff) | |
| download | freetype-005c002e2cfc6b2863cc423ac60f859eb01950cd.tar.gz | |
Update makefiles after merge of Chromium at r186157
This commit was generated by merge_from_chromium.py.
Change-Id: I1488e42493ecc5506c23b22f9a306e570667bcad
Diffstat (limited to 'ft2.target.linux-x86.mk')
| -rw-r--r-- | ft2.target.linux-x86.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ft2.target.linux-x86.mk b/ft2.target.linux-x86.mk index f304823..a08a80a 100644 --- a/ft2.target.linux-x86.mk +++ b/ft2.target.linux-x86.mk @@ -87,6 +87,7 @@ MY_CFLAGS := \ MY_CFLAGS_C := MY_DEFS := \ + '-DUSE_SKIA' \ '-D_FILE_OFFSET_BITS=64' \ '-DUSE_LINUX_BREAKPAD' \ '-DNO_TCMALLOC' \ @@ -98,7 +99,6 @@ MY_DEFS := \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ - '-DUSE_SKIA=1' \ '-DENABLE_LANGUAGE_DETECTION=1' \ '-DFT2_BUILD_LIBRARY' \ '-DDARWIN_NO_CARBON' \ |