diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-03-12 09:46:43 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-03-12 09:46:43 +0000 |
| commit | 299bdd6cce9f505dd0ee3f7e2a811b6360e71bba (patch) | |
| tree | d6b0a1e71d072385a42118904efda4e2ae6f4577 /ft2.target.linux-x86.mk | |
| parent | b2a4be12f8f7ef9305e20e0d3b19c3fce4441f3c (diff) | |
| download | freetype-299bdd6cce9f505dd0ee3f7e2a811b6360e71bba.tar.gz | |
Update makefiles after merge of Chromium at 256489
This commit was generated by merge_from_chromium.py.
Change-Id: Ib28af939ce5d29f482a7c59e0c98921b363022b7
Diffstat (limited to 'ft2.target.linux-x86.mk')
| -rw-r--r-- | ft2.target.linux-x86.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ft2.target.linux-x86.mk b/ft2.target.linux-x86.mk index 3eadd67..c4a2e76 100644 --- a/ft2.target.linux-x86.mk +++ b/ft2.target.linux-x86.mk @@ -97,7 +97,6 @@ MY_DEFS_Debug := \ '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ - '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ @@ -107,6 +106,7 @@ MY_DEFS_Debug := \ '-DCHROME_PNG_WRITE_SUPPORT' \ '-DPNG_USER_CONFIG' \ '-DCHROME_PNG_READ_PACK_SUPPORT' \ + '-DUSE_OPENSSL=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ @@ -192,7 +192,6 @@ MY_DEFS_Release := \ '-DENABLE_NEW_GAMEPAD_API=1' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ - '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ @@ -202,6 +201,7 @@ MY_DEFS_Release := \ '-DCHROME_PNG_WRITE_SUPPORT' \ '-DPNG_USER_CONFIG' \ '-DCHROME_PNG_READ_PACK_SUPPORT' \ + '-DUSE_OPENSSL=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ |