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