diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2013-10-30 16:55:22 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2013-10-30 16:55:22 +0000 |
| commit | 0de3043d8926a18e47c40b4b7df4ef7beda00cda (patch) | |
| tree | 37ab2790d5050ac15bc276e3df8f25ec6bf51120 /openssl.target.linux-arm.mk | |
| parent | 784e4645b87ac4298956b48ab52785b3c57e9c84 (diff) | |
| download | openssl-0de3043d8926a18e47c40b4b7df4ef7beda00cda.tar.gz | |
Update makefiles after merge of Chromium at 231849
This commit was generated by merge_from_chromium.py.
Change-Id: Ib8ca03ab6d94473c9d2ce130c0b32f0370d43b0e
Diffstat (limited to 'openssl.target.linux-arm.mk')
| -rw-r--r-- | openssl.target.linux-arm.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/openssl.target.linux-arm.mk b/openssl.target.linux-arm.mk index b17279a..163c72c 100644 --- a/openssl.target.linux-arm.mk +++ b/openssl.target.linux-arm.mk @@ -618,13 +618,13 @@ MY_DEFS_Debug := \ '-DANGLE_DX11' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ - '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ - '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DDISABLE_NACL' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ + '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ @@ -716,13 +716,13 @@ MY_DEFS_Release := \ '-DANGLE_DX11' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ - '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ - '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DDISABLE_NACL' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ + '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ |