diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2013-03-21 04:03:57 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2013-03-21 04:03:57 +0000 |
| commit | b0b7c9a6c61e4288ad90354cc08596fe474443bf (patch) | |
| tree | 7908dd023f83e6dd42c302d715074b20218bf22b | |
| parent | bc30ea842af2dcd28fd1ef5a80f10a308b5650d0 (diff) | |
| download | freetype-b0b7c9a6c61e4288ad90354cc08596fe474443bf.tar.gz | |
Update makefiles after merge of Chromium at r189518
This commit was generated by merge_from_chromium.py.
Change-Id: I0f1e29542e8a8f33005b0d93164ef78724722b68
| -rw-r--r-- | ft2.target.linux-arm.mk | 1 | ||||
| -rw-r--r-- | ft2.target.linux-x86.mk | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/ft2.target.linux-arm.mk b/ft2.target.linux-arm.mk index 014e9f6..a150291 100644 --- a/ft2.target.linux-arm.mk +++ b/ft2.target.linux-arm.mk @@ -91,7 +91,6 @@ MY_DEFS := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ - '-DENABLE_PEPPER_THREADING' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ 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' \ |