diff options
author | Android Chromium Automerger <chromium-automerger@android> | 2013-03-12 00:58:22 +0000 |
---|---|---|
committer | Android Chromium Automerger <chromium-automerger@android> | 2013-03-12 00:58:22 +0000 |
commit | cf474cf3d7a27fffa1d2a7f7fb0a6f12e9bebb5c (patch) | |
tree | a4bc0f27ef83112d34a47051ac8db7747e33f1a5 /ft2.target.linux-x86.mk | |
parent | 9710b66b7997a477ba07cb1f4405e46a2ed85f55 (diff) | |
download | freetype-cf474cf3d7a27fffa1d2a7f7fb0a6f12e9bebb5c.tar.gz |
Update makefiles after merge of Chromium at r187434
This commit was generated by merge_from_chromium.py.
Change-Id: I4889b587d7bc844f9fa4a15248285a0e972fb769
Diffstat (limited to 'ft2.target.linux-x86.mk')
-rw-r--r-- | ft2.target.linux-x86.mk | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/ft2.target.linux-x86.mk b/ft2.target.linux-x86.mk index 926a75c..e9c6716 100644 --- a/ft2.target.linux-x86.mk +++ b/ft2.target.linux-x86.mk @@ -92,7 +92,6 @@ MY_DEFS := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ - '-DENABLE_PEPPER_THREADING' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ |