diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-03-28 16:25:58 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-03-28 16:25:58 +0000 |
| commit | fb90560a6968a36170ad145089bf6952621d9a7f (patch) | |
| tree | c963efb176bb974f25528e06ce21cc1814594688 | |
| parent | a1083dc567f206cadd49a756209b9e07c4660a18 (diff) | |
| download | freetype-fb90560a6968a36170ad145089bf6952621d9a7f.tar.gz | |
Update makefiles after merge of Chromium at 260152
This commit was generated by merge_from_chromium.py.
Change-Id: Ie5c0d85d441e6308ab3750243c037da72cad352c
| -rw-r--r-- | ft2.target.darwin-arm.mk | 2 | ||||
| -rw-r--r-- | ft2.target.darwin-mips.mk | 2 | ||||
| -rw-r--r-- | ft2.target.darwin-x86.mk | 2 | ||||
| -rw-r--r-- | ft2.target.darwin-x86_64.mk | 2 | ||||
| -rw-r--r-- | ft2.target.linux-arm.mk | 2 | ||||
| -rw-r--r-- | ft2.target.linux-mips.mk | 2 | ||||
| -rw-r--r-- | ft2.target.linux-x86.mk | 2 | ||||
| -rw-r--r-- | ft2.target.linux-x86_64.mk | 2 |
8 files changed, 16 insertions, 0 deletions
diff --git a/ft2.target.darwin-arm.mk b/ft2.target.darwin-arm.mk index e51e7cd..ad3c23d 100644 --- a/ft2.target.darwin-arm.mk +++ b/ft2.target.darwin-arm.mk @@ -104,6 +104,7 @@ MY_DEFS_Debug := \ '-DPNG_USER_CONFIG' \ '-DCHROME_PNG_READ_PACK_SUPPORT' \ '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ @@ -197,6 +198,7 @@ MY_DEFS_Release := \ '-DPNG_USER_CONFIG' \ '-DCHROME_PNG_READ_PACK_SUPPORT' \ '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ diff --git a/ft2.target.darwin-mips.mk b/ft2.target.darwin-mips.mk index c87601f..058e47e 100644 --- a/ft2.target.darwin-mips.mk +++ b/ft2.target.darwin-mips.mk @@ -104,6 +104,7 @@ MY_DEFS_Debug := \ '-DPNG_USER_CONFIG' \ '-DCHROME_PNG_READ_PACK_SUPPORT' \ '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ @@ -197,6 +198,7 @@ MY_DEFS_Release := \ '-DPNG_USER_CONFIG' \ '-DCHROME_PNG_READ_PACK_SUPPORT' \ '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ diff --git a/ft2.target.darwin-x86.mk b/ft2.target.darwin-x86.mk index 6f09969..4e679bf 100644 --- a/ft2.target.darwin-x86.mk +++ b/ft2.target.darwin-x86.mk @@ -105,6 +105,7 @@ MY_DEFS_Debug := \ '-DPNG_USER_CONFIG' \ '-DCHROME_PNG_READ_PACK_SUPPORT' \ '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ @@ -198,6 +199,7 @@ MY_DEFS_Release := \ '-DPNG_USER_CONFIG' \ '-DCHROME_PNG_READ_PACK_SUPPORT' \ '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ diff --git a/ft2.target.darwin-x86_64.mk b/ft2.target.darwin-x86_64.mk index c9ce6eb..7f6971a 100644 --- a/ft2.target.darwin-x86_64.mk +++ b/ft2.target.darwin-x86_64.mk @@ -105,6 +105,7 @@ MY_DEFS_Debug := \ '-DPNG_USER_CONFIG' \ '-DCHROME_PNG_READ_PACK_SUPPORT' \ '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ @@ -198,6 +199,7 @@ MY_DEFS_Release := \ '-DPNG_USER_CONFIG' \ '-DCHROME_PNG_READ_PACK_SUPPORT' \ '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ diff --git a/ft2.target.linux-arm.mk b/ft2.target.linux-arm.mk index e51e7cd..ad3c23d 100644 --- a/ft2.target.linux-arm.mk +++ b/ft2.target.linux-arm.mk @@ -104,6 +104,7 @@ MY_DEFS_Debug := \ '-DPNG_USER_CONFIG' \ '-DCHROME_PNG_READ_PACK_SUPPORT' \ '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ @@ -197,6 +198,7 @@ MY_DEFS_Release := \ '-DPNG_USER_CONFIG' \ '-DCHROME_PNG_READ_PACK_SUPPORT' \ '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ diff --git a/ft2.target.linux-mips.mk b/ft2.target.linux-mips.mk index c87601f..058e47e 100644 --- a/ft2.target.linux-mips.mk +++ b/ft2.target.linux-mips.mk @@ -104,6 +104,7 @@ MY_DEFS_Debug := \ '-DPNG_USER_CONFIG' \ '-DCHROME_PNG_READ_PACK_SUPPORT' \ '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ @@ -197,6 +198,7 @@ MY_DEFS_Release := \ '-DPNG_USER_CONFIG' \ '-DCHROME_PNG_READ_PACK_SUPPORT' \ '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ diff --git a/ft2.target.linux-x86.mk b/ft2.target.linux-x86.mk index 6f09969..4e679bf 100644 --- a/ft2.target.linux-x86.mk +++ b/ft2.target.linux-x86.mk @@ -105,6 +105,7 @@ MY_DEFS_Debug := \ '-DPNG_USER_CONFIG' \ '-DCHROME_PNG_READ_PACK_SUPPORT' \ '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ @@ -198,6 +199,7 @@ MY_DEFS_Release := \ '-DPNG_USER_CONFIG' \ '-DCHROME_PNG_READ_PACK_SUPPORT' \ '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ diff --git a/ft2.target.linux-x86_64.mk b/ft2.target.linux-x86_64.mk index c9ce6eb..7f6971a 100644 --- a/ft2.target.linux-x86_64.mk +++ b/ft2.target.linux-x86_64.mk @@ -105,6 +105,7 @@ MY_DEFS_Debug := \ '-DPNG_USER_CONFIG' \ '-DCHROME_PNG_READ_PACK_SUPPORT' \ '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ @@ -198,6 +199,7 @@ MY_DEFS_Release := \ '-DPNG_USER_CONFIG' \ '-DCHROME_PNG_READ_PACK_SUPPORT' \ '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ |